Merge 'master' into 'psppsheet'.
authorBen Pfaff <blp@cs.stanford.edu>
Wed, 13 Mar 2013 04:56:49 +0000 (21:56 -0700)
committerBen Pfaff <blp@cs.stanford.edu>
Wed, 13 Mar 2013 04:56:49 +0000 (21:56 -0700)
commit681f6120a7998b83ccd439068d8c4090de10b9b5
tree1c4ea94b3f70d832110a9ed19e2a70f164a42e95
parented25e8236ce220a86c20c51636771ac160a07581
parent3d2d152d74ea2ee4b1daa53824ecdac173410719
Merge 'master' into 'psppsheet'.
src/ui/gui/automake.mk