projects / koha.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c5fe424 166f166)
Merge remote-tracking branch 'kc/new/bug_6755' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Mon, 26 Sep 2011 10:26:45 +0000 (23:26 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Mon, 26 Sep 2011 10:27:20 +0000 (23:27 +1300)
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
1  2 
C4/Templates.pm patch | diff1 | diff2 | blob | history

diff --cc C4/Templates.pm
Simple merge
Koha ILS @ FFZG - based on git://git.koha.org/pub/scm/koha.git