Merge remote-tracking branch 'upstream/master'

Author Brian <brian1461748123@gmail.com>
Author date 2016-07-28 01:42:01
Author local date 2016-07-27 18:42:01 -0700
Committer Brian <brian1461748123@gmail.com>
Committer date 2016-07-28 01:42:01
Committer local date 2016-07-27 18:42:01 -0700
Commit 0f74a2a071c15efdc3d5fb795232a85a3a0aaf55
Tree ffca1c8d3d5a47bebef8f7de579a7a8d53e36988
Parent 7ad06092e8b1c1df66225d283d20e37be6901a0a
Parent bf082caba000cb07d735f4572624c6b6fc4945aa
Merge remote-tracking branch 'upstream/master'
Affected files:
You may download the files in Public Git.