Merge remote branch 'kc/new/bug_2742' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Mon, 21 Feb 2011 19:37:25 +0000 (08:37 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Mon, 21 Feb 2011 19:37:25 +0000 (08:37 +1300)
commitf75f964ba40b7bdd1911842bc43b4df095aee583
tree015cda86d9f9ca49ef8942fd411ad5c7e6cbb616
parentfebba50ba8e76e3e892946f819f1db14105aa807
parentfc1b7201c55d00d6c43a0ecc04bee09cd0e0bde7
Merge remote branch 'kc/new/bug_2742' into kcmaster
koha-tmpl/intranet-tmpl/prog/en/modules/about.tmpl