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)
commita258e53c63a08b0ec48aea8f03808eb651729424
treef58951fcfbd43aa08961b410f373a14e26a4901d
parentca5f6bb9df6d4019d777b52da0419d917d4dfc52
parent8a920632b433443aa37e16349589f0c7d7d3cdaf
Merge commit 'origin/master' into sso

Conflicts:

src/ui/gui/psppire-syntax-window.c
configure.ac
src/ui/gui/automake.mk
src/ui/gui/psppire-data-window.c
src/ui/gui/psppire-syntax-window.c
src/ui/gui/psppire-syntax-window.h