Merge remote branch 'immerda/master'
authorintrigeri <intrigeri@boum.org>
Thu, 16 Dec 2010 12:58:10 +0000 (13:58 +0100)
committerintrigeri <intrigeri@boum.org>
Thu, 16 Dec 2010 12:58:10 +0000 (13:58 +0100)
commit5d7667b8d00cc3fc6cfa75a0413076db1dd0cff8
treefa2369ce8c2c2579a50c7505d91fedd894c32c80
parentf61a347d84d0b47f0e32cd4746c77e61c44c4ac4
parent7abdda7b1ef097f374bdf52c99c2e66c7346543e
Merge remote branch 'immerda/master'