projects / koha.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commitea418af20558801d8ee6bad2e18327e4390df077
treebecc6f5839e12c1a99bec40901dcab946ca2e38ctree | snapshot
parente93cc449410f6c8d90b616f3d8e002e9ade4daddcommit | diff
parent2c65bdcdcc735b273dc7479638989da4593368f2commit | diff
Merge branch 'bug_2832' into 3.12-master

Conflicts:
kohaversion.pl

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Koha ILS @ FFZG - based on git://git.koha.org/pub/scm/koha.git