projects
/
srvgit
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
e93cc44
2c65bdc
)
Merge branch 'bug_2832' into 3.12-master
author
Jared Camins-Esakov
<jcamins@cpbibliography.com>
Fri, 23 Nov 2012 16:44:26 +0000
(11:44 -0500)
committer
Jared 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