Merge branch 'develop'
authorZhang Xianyi <traits.zhang@gmail.com>
Tue, 23 Jul 2013 05:40:08 +0000 (13:40 +0800)
committerZhang Xianyi <traits.zhang@gmail.com>
Tue, 23 Jul 2013 05:40:08 +0000 (13:40 +0800)
commite39384432b1a1394cc6180050f92ab6fb1194492
treeb72ceff902153a7cf8bd1f2e9cb97364fb66a2bb
parenta8f9b6a665adf750901118c8c72e441ac9632dbe
parentc5437149c0e538950f8df79edc9a795465a709fa
Merge branch 'develop'