Merge branch 'bug304'
authorSteve Singer <ssinger@ca.afilias.info>
Wed, 14 Aug 2013 21:47:30 +0000 (17:47 -0400)
committerSteve Singer <ssinger@ca.afilias.info>
Wed, 14 Aug 2013 21:47:30 +0000 (17:47 -0400)

Trivial merge