Merge remote-tracking branch 'upstream/master'
authorYen Chi Hsuan <yan12125@gmail.com>
Sat, 12 Sep 2015 19:04:44 +0000 (03:04 +0800)
committerYen Chi Hsuan <yan12125@gmail.com>
Sat, 12 Sep 2015 19:04:44 +0000 (03:04 +0800)
commitf665ef8fc5887d2a93560fc992c1d2ba6b72978e
tree281971fb6d6a16b30bf2dd5caada375136baa2c9
parentb264c2130221912adfc7cc35d73c2a88d79eafeb
parent60ed60353b9ca57e8181f0b14d525ce487e673ed
Merge remote-tracking branch 'upstream/master'