projects / koha.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0126eb3 4153e14)
Merge branch 'bug_9167' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 7 Dec 2012 13:46:35 +0000 (08:46 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 7 Dec 2012 13:46:35 +0000 (08:46 -0500)

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