Merge branch 'development'

Conflicts:
	src/speech.h
This commit is contained in:
Reece H. Dunn
2013-03-07 01:00:12 +00:00
24 changed files with 220 additions and 211 deletions