Merge commit 'origin/master' into sso
authorJohn Darrington <john@darrington.wattle.id.au>
Sun, 17 Oct 2010 19:04:28 +0000 (21:04 +0200)
committerJohn Darrington <john@darrington.wattle.id.au>
Sun, 17 Oct 2010 19:04:28 +0000 (21:04 +0200)
Conflicts:

src/ui/gui/psppire-syntax-window.c


No differences found