projects / koha.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8997267 de275ec)
Merge branch 'deb_scripts_312_rc1' into 3.14-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Wed, 15 May 2013 13:32:55 +0000 (09:32 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Wed, 15 May 2013 13:32:55 +0000 (09:32 -0400)

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