Merge remote branch 'origin/master' into import-gui
authorJohn Darrington <john@darrington.wattle.id.au>
Fri, 29 Mar 2013 11:27:59 +0000 (12:27 +0100)
committerJohn Darrington <john@darrington.wattle.id.au>
Fri, 29 Mar 2013 11:27:59 +0000 (12:27 +0100)
commit8870ca57b746c93b91fb740927fcda45643499d2
tree7dec2b19c1447a1c911c15f059a90e3d6088c4df
parentbbc9e4f23035409965750a6970f888a3dfe649c6
parent40fa9400304e89516cc88bdc10ecb36733adb211
Merge remote branch 'origin/master' into import-gui

Conflicts:
src/ui/gui/text-data-import-dialog.c
src/data/casereader.c
src/data/ods-reader.c
src/ui/gui/text-data-import-dialog.c