Merge branch 'master' of ssh://jmd@git.sv.gnu.org/srv/git/pspp
authorJohn Darrington <john@marilyn.intra>
Mon, 15 Sep 2008 10:05:04 +0000 (18:05 +0800)
committerJohn Darrington <john@marilyn.intra>
Mon, 15 Sep 2008 10:05:04 +0000 (18:05 +0800)
commit5f8dc7ca9962b212d623566e287b0f1d365f6398
treebe3343cb177f8d0a8e6be98a83738bae6aa35c71
parent6fb519761f5f942e598cfd8570c52594c9456ba3
parent96b31e17b2c336995db448531ab7f86f57319b5f
Merge branch 'master' of ssh://jmd@git.sv.gnu.org/srv/git/pspp

Conflicts:

po/en_GB.po