Merge branch 'master' of git@dev.euphorik.ch:pompage
authorGreg Burri <greg.burri@gmail.com>
Wed, 30 Sep 2009 12:32:58 +0000 (14:32 +0200)
committerGreg Burri <greg.burri@gmail.com>
Wed, 30 Sep 2009 12:32:58 +0000 (14:32 +0200)

Trivial merge