git.koha-community.org Git - koha.git/commit

author	Chris Cormack <chrisc@catalyst.net.nz>
	Mon, 28 Feb 2011 09:55:59 +0000 (22:55 +1300)
committer	Chris Cormack <chrisc@catalyst.net.nz>
	Mon, 28 Feb 2011 09:55:59 +0000 (22:55 +1300)
commit	f9f35b69849dca8705df98ff0a21d2b2b1171cc8
tree	567e09aff09abbe83234ec9ae473ba8bf51b5bc9	tree \| snapshot
parent	8e3fdc6d6b46bb368167b6ae2cb0ebbe590f5e00	commit \| diff
parent	ac9fd0cff94f1df9c2bd2d2160bd85e8e532238a	commit \| diff

Merge remote branch 'kc/new/bug_3319' into kcmaster

Conflicts:
members/members-home.pl