Merge commit 'upstream/0.2.11+dfsg'
authorJulien Valroff <julien@kirya.net>
Wed, 4 Jan 2012 17:50:42 +0000 (18:50 +0100)
committerJulien Valroff <julien@kirya.net>
Wed, 4 Jan 2012 17:50:42 +0000 (18:50 +0100)
commit1d17ab0ddd79457cc90528e4c56e737ad52a8c22
tree14feea19b74054ecd8eded1b8d73a62d81f2df4e
parent454e3f8cf19411b08761fb790c249cdc30c4379d
parent0ee0c3a745ddd90f622933f3d6b5dd832ce68b57
Merge commit 'upstream/0.2.11+dfsg'