Merge remote-tracking branch 'upstream/master'
authorYen Chi Hsuan <yan12125@gmail.com>
Wed, 11 Nov 2015 16:08:42 +0000 (00:08 +0800)
committerYen Chi Hsuan <yan12125@gmail.com>
Wed, 11 Nov 2015 16:08:42 +0000 (00:08 +0800)
commita4c2ab35c1c1cc7385b21b15e5c082313236048c
tree73fa79731f8cf4b62c83247b9bbb8835ac2c9edb
parent8b8a39e279b02926197230024e64a50d7995b95d
parent3d9c4bf09a57871f0030d6b6022b863d66616b8b
Merge remote-tracking branch 'upstream/master'