Merge branch 'linhua55-master'
authorYen Chi Hsuan <yan12125@gmail.com>
Sat, 12 Sep 2015 14:45:32 +0000 (22:45 +0800)
committerYen Chi Hsuan <yan12125@gmail.com>
Sat, 12 Sep 2015 14:45:32 +0000 (22:45 +0800)

Trivial merge