Merge remote-tracking branch 'upstream/master'
authorYen Chi Hsuan <yan12125@gmail.com>
Tue, 3 Nov 2015 16:54:27 +0000 (00:54 +0800)
committerYen Chi Hsuan <yan12125@gmail.com>
Tue, 3 Nov 2015 16:54:27 +0000 (00:54 +0800)
commit236cb2131b1dc45c9b7ffc534f0a9abfe2fff76c
tree7ef644b335fd1e3f702a89e2bbcf435bd42b5cf5
parent66d041f250f7d3e0c4d501e3b98721f2c6588c35
parentbfdf891fd36811909aa5d83dc0614eacbb634fcf
Merge remote-tracking branch 'upstream/master'