Merge remote-tracking branch 'upstream/master'
authorYen Chi Hsuan <yan12125@gmail.com>
Thu, 14 May 2015 09:07:02 +0000 (17:07 +0800)
committerYen Chi Hsuan <yan12125@gmail.com>
Thu, 14 May 2015 09:07:02 +0000 (17:07 +0800)
commit88f9d8748c19d1ee6a06e95eb5ed4dc31052e9ad
tree2737f1251df81902b24545db0c5254afabcbfb94
parentc827d4cfdb9ce47d13ccbec32d2b32dfb429ea8a
parent7d57d2e18be416faa593364966ccf667243fd3ea
Merge remote-tracking branch 'upstream/master'