projects / koha.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9624644 759499d)
Merge remote branch 'magnus/bug6002-sample-data' into new/enh/bug_6002
authorChris Cormack <chrisc@catalyst.net.nz>
Sat, 2 Apr 2011 06:51:27 +0000 (19:51 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Sat, 2 Apr 2011 06:51:27 +0000 (19:51 +1300)

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