Merge remote branch 'origin/master' into import-gui
authorJohn Darrington <john@darrington.wattle.id.au>
Sat, 23 Mar 2013 16:10:25 +0000 (17:10 +0100)
committerJohn Darrington <john@darrington.wattle.id.au>
Sat, 23 Mar 2013 16:10:25 +0000 (17:10 +0100)
commit504ee72af2e3f4df358ca45b8acb847affdb85cb
tree83a25ab56846b6b226385a4bd5045a3a261ea834
parent57f8e63788b658d9b3d3377d5e28adedec06cc43
parent29c1450251805417aacb9cecc84b03c81137c137
Merge remote branch 'origin/master' into import-gui

Conflicts:
src/ui/gui/automake.mk
src/ui/gui/page-assistant.c
src/ui/gui/page-file.c
src/ui/gui/text-data-import-dialog.c
src/ui/gui/text-data-import-dialog.c