Merge branch 'master' into release

This commit is contained in:
snowleo 2011-07-20 23:09:40 +02:00
commit 0ffe24903a

Binary file not shown.