qiniu/docs.qiniu.com — pull request #26 by icattlecoder (2013-07-19 09:47:32+00:00)
Title: Fix merge master2 dev

Fix merge master2 dev