Merge 1.7 prep into master.

This was one hell of a messy merge; things may very well explode.

Signed-off-by: Sunstrike <[email protected]>
This commit is contained in:
Sunstrike committed 2013-11-27 17:46:07 +00:00
commit 6ad0723020
559 files changed
+4502 -1777

No files matched your search

File diff suppressed because it is too large. Load diff