projects / koha.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1c9ef0f 8307a1f)
Merge remote branch 'kc/master' into new/enh/bug_5917
authorChris Cormack <chrisc@catalyst.net.nz>
Fri, 8 Apr 2011 02:29:21 +0000 (14:29 +1200)
committerChris Cormack <chrisc@catalyst.net.nz>
Fri, 8 Apr 2011 02:29:21 +0000 (14:29 +1200)
1  2 
C4/Auth.pm patch | diff1 | diff2 | blob | history
catalogue/search.pl patch | diff1 | diff2 | blob | history

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