Merge commit 'upstream/1.1.3'
authorSven Hoexter <sven@stormbind.net>
Mon, 17 Jan 2011 15:35:01 +0000 (16:35 +0100)
committerSven Hoexter <sven@stormbind.net>
Mon, 17 Jan 2011 15:35:01 +0000 (16:35 +0100)
commite685345e7e418731ba7d75c149dd067f67c1a7d0
treea077901c5969c4f874c64fee051e52fddcc10797
parentbff4deea04a219797dd1d4a6179c704f2719da4b
parent80016b92950431352612eb3f713acd5f5a7a0e81
Merge commit 'upstream/1.1.3'