Revision b622cd9abe52197d2dc70c344df17334bc45320b

Committed on 19/04/2012 11:55 am by Frank <fneff89@gmail.com> [GitHub Diff]

Merge branch 'master' into development

Conflicts:
README