Merge remote branch 'kc/new/bug_2742' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Sun, 27 Feb 2011 20:09:33 +0000 (09:09 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Sun, 27 Feb 2011 20:09:33 +0000 (09:09 +1300)
commit622f804ffdb0f38ab8ba9b4952729e7c5e9a3234
tree2a51c4812faaff23e56fb269c4f3315e85f24ba4
parentbf704ce989a1d4e562f4d9f2b844158b7b19ce78
parent575a690b4e0e833db54cb1dbfc5da7470c165b17
Merge remote branch 'kc/new/bug_2742' into kcmaster
koha-tmpl/intranet-tmpl/prog/en/modules/about.tmpl