Merge commit 'github/master'
authorduritong <peter.meier@immerda.ch>
Thu, 17 Jul 2008 18:49:09 +0000 (20:49 +0200)
committerduritong <peter.meier@immerda.ch>
Thu, 17 Jul 2008 18:49:09 +0000 (20:49 +0200)
commitf26fc6f66fafa8fb0d4db6ed164e176e7ba7c3a8
tree4da08cb241d72765e10641c88c6506fb71bd0fe4
parentcc024b9e4b4bc76e60908eefd0525a0ddf25e7fa
parent4a7b0491b2e9c92733098650782fc60edb57cddb
Merge commit 'github/master'