2014年07月08日21:15:44

Signed-off-by: mrc <313187850@qq.com>
Merge branch 'master' of https://github.com/c4cat/cobox

Signed-off-by: mrc <313187850@qq.com>

Conflicts:
	static/js/drag.js
2014年07月08日22:11:12

Signed-off-by: mrc <313187850@qq.com>