Merge branch 'steven7851-patch-2'
authorYen Chi Hsuan <yan12125@gmail.com>
Fri, 26 Aug 2016 17:17:12 +0000 (01:17 +0800)
committerYen Chi Hsuan <yan12125@gmail.com>
Fri, 26 Aug 2016 17:17:12 +0000 (01:17 +0800)
commitd181cff685aa889864a0356fa546e2d5605f27d2
treee08897e842976b75c44a5986214858859548e5da
parent906b87cf5f6ccf28ebd75d6a92367d7c238f2ad9
parent3b4b82d4cec702fc06e2d6b38a44dd0c7bd77a5b
Merge branch 'steven7851-patch-2'