Merge commit 'upstream/3.05'
authorSven Hoexter <sven@stormbind.net>
Mon, 17 Jan 2011 15:25:32 +0000 (16:25 +0100)
committerSven Hoexter <sven@stormbind.net>
Mon, 17 Jan 2011 15:25:32 +0000 (16:25 +0100)
commit49dfffaf7374577b124ad143aa5f42318a25d861
tree386d7c6e5b19ca682d543ef3b064faa0e62a9823
parenta7d96890464a49f7bc2d9748a2fd9ab370409801
parent8b83892bf9d924349d5e09c88f16790a8086a950
Merge commit 'upstream/3.05'