Merge branch 'master' into import-gui
authorJohn Darrington <john@darrington.wattle.id.au>
Fri, 22 Mar 2013 19:01:04 +0000 (20:01 +0100)
committerJohn Darrington <john@darrington.wattle.id.au>
Fri, 22 Mar 2013 19:01:04 +0000 (20:01 +0100)
commit57f8e63788b658d9b3d3377d5e28adedec06cc43
treec452cdb71dd6c48c69a575163cbd3d55f935270f
parent4c9a878ab50af136c9375b5c1da86f31088739d8
parentcf10258e2e58c352c555dd2579d2fe9f5b2fce50
Merge branch '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/page-assistant.c
src/ui/gui/page-file.c
src/ui/gui/text-data-import-dialog.c