projects / koha.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 50ea8cf 3fe43df)
Merge branch 'bug_7896' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Sun, 2 Dec 2012 14:40:48 +0000 (09:40 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Sun, 2 Dec 2012 14:40:48 +0000 (09:40 -0500)

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