Merge branch 'master' of ssh://jmd@git.sv.gnu.org/srv/git/pspp
authorJohn Darrington <john@marilyn.intra>
Sat, 26 Jul 2008 06:12:01 +0000 (14:12 +0800)
committerJohn Darrington <john@marilyn.intra>
Sat, 26 Jul 2008 06:12:01 +0000 (14:12 +0800)
commitf6b8e421cd29ae0aef4018bbe2e1a06d0bef57df
treefb3446031d0893819c37fc9680c5c865e56e1930
parentfc2284433015a514d16a4dbf0aba530d5de3ebaf
parente051d2cccc85e4ae2c46bddc7c674676ba7a5515
Merge branch 'master' of ssh://jmd@git.sv.gnu.org/srv/git/pspp

Conflicts:

src/math/ChangeLog
src/math/ChangeLog