projects / koha.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5ca45b8 a06fd22)
Merge branch 'bug_7018' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Wed, 20 Mar 2013 12:05:07 +0000 (08:05 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Wed, 20 Mar 2013 12:05:07 +0000 (08:05 -0400)

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