Merge branch 'master' into 0.7.0-dev

Conflicts:
	src/actypes.d
	src/server/autocomplete.d
This commit is contained in:
Hackerpilot 2015-08-07 17:04:12 -07:00
commit 9b56b3c8e6

Diff Content Not Available