Merge branch 'develop'
authorZhang Xianyi <traits.zhang@gmail.com>
Sat, 20 Jul 2013 15:05:36 +0000 (23:05 +0800)
committerZhang Xianyi <traits.zhang@gmail.com>
Sat, 20 Jul 2013 15:05:36 +0000 (23:05 +0800)
commita8f9b6a665adf750901118c8c72e441ac9632dbe
treeebc06d1ec1d928a0503616f87d8319d11a97a61f
parent54e7b37630bfb5015358cdfd12aafceac7253f6a
parent6209c8fc44039142dee1114dadb5789d1cbb059c
Merge branch 'develop'