Merge 'master' into 'psppsheet'.
authorBen Pfaff <blp@cs.stanford.edu>
Sun, 28 Oct 2012 20:02:13 +0000 (13:02 -0700)
committerBen Pfaff <blp@cs.stanford.edu>
Sun, 28 Oct 2012 20:10:05 +0000 (13:10 -0700)
1  2 
src/ui/gui/psppire-button-editable.c

Simple merge