Merge commit 'upstream/0.9.6'
authorSven Hoexter <sven@timegate.de>
Sat, 14 Jan 2012 12:30:13 +0000 (13:30 +0100)
committerSven Hoexter <sven@timegate.de>
Sat, 14 Jan 2012 12:30:13 +0000 (13:30 +0100)
commit5f0f9f40c1e9014e86eeb82d8c4bc718dae999cc
tree5a8da65a0512c4d527e2f8e007e65ac41ba40069
parent8429707d7bd1ea8128f173613256426d01d3905d
parentdbe4348df2ba88986e13163ef13d09fb7247589d
Merge commit 'upstream/0.9.6'