Merge branch 'translation' of git://git.workbuffer.org/git/koha into to-push
authorGalen Charlton <gmcharlt@gmail.com>
Thu, 21 Oct 2010 21:25:45 +0000 (17:25 -0400)
committerGalen Charlton <gmcharlt@gmail.com>
Thu, 21 Oct 2010 21:25:45 +0000 (17:25 -0400)
commitbdd1f81fc119b2ae18b26c60144cb4446af35b96
tree9419bebbb7524d74ee27800347b1dfc7975bd195
parent1d27d23f86e6e3edd2e73c6f83d7ae4c5004ed43
parente9aabbee5461bcf0cd03c4968524c7d88f9ae48d
Merge branch 'translation' of git://git.workbuffer.org/git/koha into to-push