projects / koha.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e84c0b6 fe5115e)
Merge branch 'bug_9688' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Thu, 7 Mar 2013 15:18:20 +0000 (10:18 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Thu, 7 Mar 2013 15:18:20 +0000 (10:18 -0500)

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