From: Galen Charlton <galen.charlton@liblime.com>
Date: Wed, 19 Dec 2007 20:47:28 +0000 (-0600)
Subject: Merge git://git.koha.org/pub/scm/koha
X-Git-Tag: v3.00.00-alpha~382^2
X-Git-Url: http://git.rot13.org/?p=koha.git;a=commitdiff_plain;h=b5970e02b2d715cfd51d2519f4f715dc993ef682

Merge git://git.koha.org/pub/scm/koha
---

b5970e02b2d715cfd51d2519f4f715dc993ef682