projects / koha.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a82e2b9 90d00a5)
Merge branch 'bug_7687' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 30 Nov 2012 03:18:06 +0000 (22:18 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 30 Nov 2012 03:18:06 +0000 (22:18 -0500)

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