Merge commit 'upstream/0.2.11'
authorJulien Valroff <julien@kirya.net>
Tue, 6 Jul 2010 12:16:29 +0000 (14:16 +0200)
committerJulien Valroff <julien@kirya.net>
Tue, 6 Jul 2010 12:16:29 +0000 (14:16 +0200)
commit7df640e6a4791914bc3f3e67a5a70a81eed9cebb
tree89eb90ccaa19189b83e600e10c9b3dbcd85d5228
parent71388b02931b612eeb0cf23c1ad391da5bd3f608
parent1494ac390b204d0127a02516d45d2cd23acab5d2
Merge commit 'upstream/0.2.11'