Merge branch 'prerelease'

This commit is contained in:
Nick Parker 2015-07-13 11:54:57 -05:00
commit 020b6e2caf
1 changed files with 1400 additions and 2698 deletions

3940
configure vendored

File diff suppressed because it is too large Load Diff