projects / koha.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 82eb163 0cd32f5)
Merge branch 'bug_8946' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 30 Nov 2012 12:09:47 +0000 (07:09 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 30 Nov 2012 12:09:47 +0000 (07:09 -0500)

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