Merge branch '1.7' into development (We're back to two branches)

Conflicts:
	build.properties
This commit is contained in:
Aidan Brady committed 2014-05-08 17:40:27 -04:00
commit 6025572f15
1260 files changed
+6653 -5813

No files matched your search

File diff suppressed because it is too large. Load diff