Merge branch 'dev-3.0.0'
authorlang <bm2736892@gmail.com>
Mon, 11 Jan 2016 18:19:32 +0000 (02:19 +0800)
committerlang <bm2736892@gmail.com>
Mon, 11 Jan 2016 18:19:32 +0000 (02:19 +0800)
commite675b244a15d1b46cc79ae04760e1a638652228b
tree3cc2ca81d2065923ce247db22a756a4cb433c182
parent26913b26285201157eca05ce3e91855031156ea1
parentf54966719c7dfa9ea1b03122ba0a8690da313db6
Merge branch 'dev-3.0.0'

# Conflicts:
# .gitignore
# .jshintrc