Merge remote-tracking branch 'origin/stable-1.1'

Conflicts:
	README.md
This commit is contained in:
Tobias Doerffel
2014-09-28 18:11:54 +02:00
18 changed files with 789 additions and 2 deletions