projects / koha.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 25bc645 2421613)
Merge branch 'bug_8996' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Sat, 10 Nov 2012 02:30:30 +0000 (21:30 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Sat, 10 Nov 2012 02:30:30 +0000 (21:30 -0500)

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