Merge branch 'reorg-color-setting'
commit1edf64e00fd6444f10e469f1a123c0e57921c972
authorSup Yut Sum <ch3cooli@gmail.com>
Sun, 28 Jul 2013 11:07:17 +0000 (28 19:07 +0800)
committerSup Yut Sum <ch3cooli@gmail.com>
Sun, 28 Jul 2013 11:07:17 +0000 (28 19:07 +0800)
tree11f0026c48fc4bb7139734783b2a40f60ec205c2
parent886f02eed0ca406984797b9120e255922faf6ef2
parent39b56e94697a09ddb92e6d669bcd04a10f97dee9
Merge branch 'reorg-color-setting'