projects / koha.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4669a10 3884e16)
Merge remote branch 'kc/new/bug_3670' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Sun, 27 Mar 2011 08:19:24 +0000 (21:19 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Sun, 27 Mar 2011 08:19:24 +0000 (21:19 +1300)
Conflicts:
koha-tmpl/intranet-tmpl/prog/en/includes/messaging-preference-form.inc

1  2 
koha-tmpl/intranet-tmpl/prog/en/includes/messaging-preference-form.inc patch | diff1 | diff2 | blob | history

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