Merge remote branch 'origin/master' into import-gui
authorJohn Darrington <john@darrington.wattle.id.au>
Fri, 8 Mar 2013 13:14:26 +0000 (14:14 +0100)
committerJohn Darrington <john@darrington.wattle.id.au>
Fri, 8 Mar 2013 13:14:26 +0000 (14:14 +0100)
commitffe5ba65c269e9207308608139ea2cbb4fcb761f
tree8ef4c938a2f1d4bd793c17c562f6f0448ea677ba
parent45e451f87ff06ec753ed9e860f2b1dd953ce5eed
parent1c7f6a1a90ea22ced2e21e5dec32a2bc23ccfbf0
Merge remote branch 'origin/master' into import-gui

Conflicts:
src/ui/gui/psppire-spreadsheet-model.c