Merge branch 'develop'
authorZhang Xianyi <traits.zhang@gmail.com>
Mon, 8 Oct 2012 05:38:03 +0000 (13:38 +0800)
committerZhang Xianyi <traits.zhang@gmail.com>
Mon, 8 Oct 2012 05:38:03 +0000 (13:38 +0800)
commit2df2878dfcfc389cb0e85278128a45e4cdec9142
tree5e0c72c07fb62733277acf08cc2b93af25cf8b46
parent48f075cfd52b73bf77d7627fcb425392c4d6bf24
parent0b719945c56bc2a25146706ff12542a0d6688d9b
Merge branch 'develop'