projects / koha.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 898ab73 82ed469)
Merge branch 'master' into new/bug_7164
authorPaul Poulain <paul.poulain@biblibre.com>
Wed, 14 Dec 2011 14:35:39 +0000 (15:35 +0100)
committerPaul Poulain <paul.poulain@biblibre.com>
Wed, 14 Dec 2011 14:35:39 +0000 (15:35 +0100)

Trivial merge
Koha ILS @ FFZG - based on git://git.koha.org/pub/scm/koha.git