projects / koha.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 982a1d7 e2cf59a)
Merge branch 'bug_8997' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Tue, 20 Nov 2012 12:20:23 +0000 (07:20 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Tue, 20 Nov 2012 12:20:23 +0000 (07:20 -0500)

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