projects / koha.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 59605e8 85fd38e)
Merge branch 'bug_6329' into 3.14-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Wed, 15 May 2013 11:25:38 +0000 (07:25 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Wed, 15 May 2013 11:25:38 +0000 (07:25 -0400)

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