projects / koha.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b24252b f6a10cf)
Merge branch 'bug_7368' into 3.14-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Wed, 1 May 2013 11:58:41 +0000 (07:58 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Wed, 1 May 2013 11:58:41 +0000 (07:58 -0400)
1  2 
docs/history.txt patch | diff1 | diff2 | blob | history

diff --cc docs/history.txt
Simple merge
Koha ILS @ FFZG - based on git://git.koha.org/pub/scm/koha.git