Merge branch 'master' into develop

# Conflicts:
#	src/entry/Maat_rule.cpp
#	src/entry/Makefile
This commit is contained in:
zhengchao
2015-12-24 18:11:59 +08:00
4 changed files with 1895 additions and 10 deletions

File diff suppressed because it is too large Load Diff