Merge tag 'upstream/0.9.7'
authorSven Hoexter <sven@timegate.de>
Fri, 9 Mar 2012 18:37:32 +0000 (19:37 +0100)
committerSven Hoexter <sven@timegate.de>
Fri, 9 Mar 2012 18:37:32 +0000 (19:37 +0100)
commitbdac146497d70488232fc8d465dd3f2b9877d94c
treecede8e9f4a54ef745fcb379e07d39f7337520a14
parent790b92c98cd2d41caaf85224b765a93b5f6052d3
parent9799d681703e3a63dbbf876c16c9bb51b20c8fab
Merge tag 'upstream/0.9.7'

Upstream version 0.9.7