Merge branch 'develop' into bulldozer
authorZhang Xianyi <traits.zhang@gmail.com>
Mon, 5 Aug 2013 07:51:53 +0000 (15:51 +0800)
committerZhang Xianyi <traits.zhang@gmail.com>
Mon, 5 Aug 2013 07:51:53 +0000 (15:51 +0800)
commit143cca4dd5406ecd27bb89cbfee341c51cb8f2c6
tree14a0bc7326e51e7f7570a983ca4e9800a6a724d0
parent72b1edaf1bbb0c004eb5a4d4546eaea445158e05
parent79ba52115d9fe65e5aade98d4265c054a8c34b8e
Merge branch 'develop' into bulldozer