Merge remote-tracking branch 'kc/new/bug_6679' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Fri, 23 Sep 2011 02:19:11 +0000 (14:19 +1200)
committerChris Cormack <chrisc@catalyst.net.nz>
Fri, 23 Sep 2011 02:19:11 +0000 (14:19 +1200)
commit48d62dccfde25a7e19f662c94ecd37e7c69f289f
tree5ecdec15538cf075f78074cfa8c18897291f9990
parent9966d218ae1705b272841c721bf4355437ba5a44
parente1bb9e5137110c636334d4039b46c68bfd615b42
Merge remote-tracking branch 'kc/new/bug_6679' into kcmaster
authorities/authorities.pl