Merge branch 'master' into import-gui
authorJohn Darrington <john@darrington.wattle.id.au>
Thu, 9 May 2013 17:39:15 +0000 (19:39 +0200)
committerJohn Darrington <john@darrington.wattle.id.au>
Thu, 9 May 2013 17:39:15 +0000 (19:39 +0200)
commite2bba9cb07cce1652090b1931393d5739a3a9868
treecb8fb70b3e1dcbfaec1f2bd6e647b96886144a6b
parent659c54ca0aa9728f7b7783347a6be741ffb87ff3
parent367686641f08e0f6cfd168e451de4e390ee2a759
Merge branch 'master' into import-gui

Conflicts:
src/ui/gui/psppire-cell-renderer-button.c