projects / koha.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b40febb 92f289e)
Merge branch 'master' of git://git.koha-community.org/koha into 3.14-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Mon, 6 May 2013 12:54:25 +0000 (08:54 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Mon, 6 May 2013 12:54:25 +0000 (08:54 -0400)

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