Merge branch 'savannah/perl-module'
authorJohn Darrington <john@darrington.wattle.id.au>
Thu, 29 Jan 2009 22:37:37 +0000 (07:37 +0900)
committerJohn Darrington <john@darrington.wattle.id.au>
Thu, 29 Jan 2009 22:37:37 +0000 (07:37 +0900)
commitd75247c28e0dce9c21070e4ee14fdc6a2338fb77
tree05ce978f43134ce2efbbe72d09332e8c6308ff26
parent468d19460a8bc3fc9541cde13db5d88e02da71f2
parent0fc5ac957f04c06ab30b990600684d41c68fe1e5
Merge branch 'savannah/perl-module'

Conflicts:

po/en_GB.po
src/libpspp/automake.mk
po/en_GB.po
src/libpspp/automake.mk