Merge remote-tracking branch 'upstream/master'

Author Brian <brian1461748123@gmail.com>
Author date 2016-07-29 21:37:44
Author local date 2016-07-29 14:37:44 -0700
Committer Brian <brian1461748123@gmail.com>
Committer date 2016-07-29 21:37:44
Committer local date 2016-07-29 14:37:44 -0700
Commit 05e4b346d2107da14e14312a83ca5d69572bd914
Tree 7a5178fa05497f0385c37c13a61bb69b66409588
Parent 3e7e0808b2199588ad20517a411f024c69323087
Parent 3c84d294b652c5a880a44bd6d45dbca6db8af304
Merge remote-tracking branch 'upstream/master'
Affected files:
You may download the files in Public Git.