Merge branch 'master' into spellcreation

This commit is contained in:
scrawl 2012-10-11 17:29:44 +02:00
commit cf0596c216

2
extern/shiny vendored

@ -1 +1 @@
Subproject commit ffd078843c11586107024ccbc2493d0ec2df896c Subproject commit f17c4ebab0e7a1f3bbb25fd9b3dbef2bd742536a