Merge remote-tracking branch 'whot/publican'
authorKristian Høgsberg <krh@bitplanet.net>
Wed, 29 Feb 2012 16:54:36 +0000 (11:54 -0500)
committerKristian Høgsberg <krh@bitplanet.net>
Wed, 29 Feb 2012 16:54:36 +0000 (11:54 -0500)

Trivial merge