Merge branch 'master' into release

This commit is contained in:
snowleo 2011-07-20 22:37:43 +02:00
commit e550a7cc44

Binary file not shown.