projects / koha.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c98d65a f8130fb)
Merge branch 'bug_10115' into 3.14-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 26 Apr 2013 11:54:13 +0000 (07:54 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 26 Apr 2013 11:54:13 +0000 (07:54 -0400)

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