Merge branch 'develop'
authorZhang Xianyi <traits.zhang@gmail.com>
Wed, 16 Jul 2014 10:04:30 +0000 (18:04 +0800)
committerZhang Xianyi <traits.zhang@gmail.com>
Wed, 16 Jul 2014 10:04:30 +0000 (18:04 +0800)
commit21b5347fbe81622bd4569dd7e3f4f69deead1b25
treef140f872559c5eeea41b54a5311daa5b2c548901
parentf9991fd5f627569827f73c5be46addfaf8ced6a5
parentf2eb4807389e30250809a738c102f7d31bd3c635
Merge branch 'develop'