Merge remote-tracking branch 'upstream/master'
authorYen Chi Hsuan <yan12125@gmail.com>
Sat, 30 Jan 2016 08:25:55 +0000 (16:25 +0800)
committerYen Chi Hsuan <yan12125@gmail.com>
Sat, 30 Jan 2016 08:25:55 +0000 (16:25 +0800)
commit8bf39420b4712c33aff45abba4a910e7e58cba5a
treec5bf40f9baea503b9a78affabac1792bf55659f8
parent71d08b3e2955683ce0222473dff358496798f5b5
parent83ab8a79ccc3b6ef143f7d636c0118f7c3e5777b
Merge remote-tracking branch 'upstream/master'