Merge branch 'master' of ssh://git@localhost/cl7
authorGreg Burri <greg.burri@gmail.com>
Wed, 16 Sep 2009 15:43:27 +0000 (17:43 +0200)
committerGreg Burri <greg.burri@gmail.com>
Wed, 16 Sep 2009 15:43:27 +0000 (17:43 +0200)
commit9c682b3ad5335bfeaff7f133bf1a2e0f0c9c0f82
tree039326584aacbf23ea34e9d50db3dc57ac5e7149
parent6bf2995e3323a0a8572b07442c114f12d23c40bf
parent117b0123aca7e5f286289975b8fc56371192fb12
Merge branch 'master' of ssh://git@localhost/cl7