merged changes from RC_1_0

This commit is contained in:
Arvid Norberg 2015-06-03 05:12:54 +00:00
parent 4e1e53f066
commit b5a30a65ae
2 changed files with 6 additions and 6 deletions