Merge branch 'master' into pedantic

This commit is contained in:
Marc Zinnschlag 2012-10-09 19:24:27 +02:00
commit fb7e5699aa

2
extern/shiny vendored

@ -1 +1 @@
Subproject commit ffd078843c11586107024ccbc2493d0ec2df896c
Subproject commit b9ed0f2f3f10915aafd083248a1d6a37293c0db0