Merge remote branch 'kc/new/enh/bug_5952' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Thu, 14 Apr 2011 02:41:25 +0000 (14:41 +1200)
committerChris Cormack <chrisc@catalyst.net.nz>
Thu, 14 Apr 2011 02:41:25 +0000 (14:41 +1200)
commit7cfa1ca50938f597ddb21b0a81a0597d60ed06d1
tree2bff613d7b4b5046ac763d1fd99de7f30b411678
parentd00d0721b2898481e148480906502c5445cc4dec
parent49af98afd7dd0a48605a3d77dcc6b24c9b9b549c
Merge remote branch 'kc/new/enh/bug_5952' into kcmaster
koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt