Merge branch 'master' into nif-cleanup

This commit is contained in:
scrawl 2012-07-23 15:59:30 +02:00
commit ce0d351b38

2
extern/shiny vendored

@ -1 +1 @@
Subproject commit 73ddc737ce6334b264649fd4b0a16109fd8b8a99
Subproject commit 5546a5bd8474ef328dfedae2df42126cdaf9515f