From: Greg Burri <greg.burri@gmail.com>
Date: Wed, 30 Sep 2009 12:32:58 +0000 (+0200)
Subject: Merge branch 'master' of git@dev.euphorik.ch:pompage
X-Git-Url: http://git.euphorik.ch/?a=commitdiff_plain;ds=sidebyside;h=94fb6110cfb60b67ce97f4e5290f1cd53dd52809;hp=94fb6110cfb60b67ce97f4e5290f1cd53dd52809;p=pompage.git

Merge branch 'master' of git@dev.euphorik.ch:pompage
---