projects / koha_fer / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e93cc44 2c65bdc)
Merge branch 'bug_2832' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 23 Nov 2012 16:44:26 +0000 (11:44 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 23 Nov 2012 16:44:26 +0000 (11:44 -0500)
Conflicts:
kohaversion.pl

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.