Merge commit 'origin/master' into sso
authorJohn Darrington <john@darrington.wattle.id.au>
Tue, 24 Aug 2010 13:23:05 +0000 (15:23 +0200)
committerJohn Darrington <john@darrington.wattle.id.au>
Tue, 24 Aug 2010 13:23:05 +0000 (15:23 +0200)
commitca5f6bb9df6d4019d777b52da0419d917d4dfc52
treeebecb4b35fb3aa510b6260f9f2d492189546a7e6
parent5418debea5287aa2e9c49d99c26e6e1f40788dd4
parentf5c20c9555754967be55d063f450db23557478cc
Merge commit 'origin/master' into sso

Conflicts:

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