Merge remote-tracking branch 'origin/master' into gtk3
authorJohn Darrington <john@darrington.wattle.id.au>
Mon, 24 Jun 2013 19:34:33 +0000 (21:34 +0200)
committerJohn Darrington <john@darrington.wattle.id.au>
Mon, 24 Jun 2013 19:34:33 +0000 (21:34 +0200)
commitb2b2b0a29f80de89d96bcceea90f117930ab47b9
tree9a85e2c56c57ac12fdfe4ba9c73d25fed5200ede
parent683961575de1160a98ed9a262b05db597b2e7609
parentbd981ce2f73ef902f90362913c8cac741f86e1e7
Merge remote-tracking branch 'origin/master' into gtk3

Conflicts:
INSTALL
INSTALL
src/ui/gui/psppire-data-sheet.c
src/ui/gui/psppire-data-window.c