update from latest master, fix some typos#1
Merged
martinadams merged 32 commits intomartinadams:masterfrom gbirchmeier:314Jun 10, 2015
+890-123
Commits
Commits on Nov 16, 2014
Commits on Nov 17, 2014
Commits on Nov 24, 2014
Commits on Dec 2, 2014
Commits on Dec 14, 2014
- committed
Commits on Jan 2, 2015
Commits on Mar 19, 2015
Commits on May 7, 2015
Commits on May 13, 2015
Commits on May 18, 2015
Commits on May 19, 2015
Commits on Jun 1, 2015
Commits on Jun 8, 2015
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
Commits on Jun 9, 2015
- committed
- committed
- committed
- committed
- committed
Commits on Jun 10, 2015
- committed
- committed