projects / koha.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 33403b6 1aeff20)
Merge branch 'bug_7921' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Sat, 10 Nov 2012 01:24:24 +0000 (20:24 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Sat, 10 Nov 2012 01:24:24 +0000 (20:24 -0500)

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