Merge branch '4.0'

This commit is contained in:
Dan Stillman 2015-11-01 21:22:13 -05:00
commit 7f43ca9503
173 changed files with 3568 additions and 1419 deletions

View file

@ -25,7 +25,7 @@
<Description>
<em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
<em:minVersion>31.0</em:minVersion>
<em:maxVersion>39.*</em:maxVersion>
<em:maxVersion>41.*</em:maxVersion>
</Description>
</em:targetApplication>