Merge remote branch 'immerda/master'
authorintrigeri <intrigeri@boum.org>
Sat, 11 Dec 2010 12:23:23 +0000 (13:23 +0100)
committerintrigeri <intrigeri@boum.org>
Sat, 11 Dec 2010 12:23:23 +0000 (13:23 +0100)
commitf61a347d84d0b47f0e32cd4746c77e61c44c4ac4
tree5dee1f5aab0f93ec1ace0f35f0fb0bf72d6704bd
parentf9b0f065b387b2ef37036379f1fabd274dfd30cc
parentd1abd33530db6ff4cc2351347f636bce8eb078cb
Merge remote branch 'immerda/master'