From: Greg Burri <greg.burri@gmail.com>
Date: Wed, 16 Sep 2009 15:43:27 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git@localhost/cl7
X-Git-Url: http://git.euphorik.ch/?p=cl7.git;a=commitdiff_plain;h=9c682b3ad5335bfeaff7f133bf1a2e0f0c9c0f82

Merge branch 'master' of ssh://git@localhost/cl7
---

9c682b3ad5335bfeaff7f133bf1a2e0f0c9c0f82