Merge commit 'github/master'
authormh <mh@immerda.ch>
Thu, 29 May 2008 16:51:52 +0000 (16:51 +0000)
committermh <mh@immerda.ch>
Thu, 29 May 2008 16:51:52 +0000 (16:51 +0000)
commit3bc416abf330674c2200d9ffc6d60838d7fcc76c
treea624b80caefdc177376c460779b54f943ca340a1
parent3be51019f252939ca50ed0574ed7d1f595594732
Merge commit 'github/master'
files/.git_placeholder [new file with mode: 0644]