projects / koha.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 675a322 84d7a0e)
Merge branch 'master' into template_toolkit
authorChristopher Hall <chris.hall@catalyst.net.nz>
Thu, 18 Nov 2010 21:11:47 +0000 (10:11 +1300)
committerChristopher Hall <chris.hall@catalyst.net.nz>
Thu, 18 Nov 2010 21:11:47 +0000 (10:11 +1300)

Trivial merge
Koha ILS @ FFZG - based on git://git.koha.org/pub/scm/koha.git