Merge branch 'master' into promethium
authorPriyadi Iman Nurcahyo <priyadi@priyadi.net>
Sat, 26 Nov 2016 06:31:17 +0000 (13:31 +0700)
committerPriyadi Iman Nurcahyo <priyadi@priyadi.net>
Sat, 26 Nov 2016 06:31:17 +0000 (13:31 +0700)
commitb5511b9a8aa3827279fc132ecf3e5dd9c9c07668
treee902e8f6dfc67272a98bfbbba0f77b7830bb8604
parent4b0d16cd7bdcd41cffb17a7b6eed7cb44beaef34
parentbf23ac96f62be1cb36d414e76599523af3caf00f
Merge branch 'master' into promethium