Merge with base fork#2
Merged
gashtio merged 8 commits intoCoherentLabs:masterfrom hendrikp:masterFeb 16, 2014
+41-28
Commits
Commits on Nov 25, 2013
- committed
- committed
- committed
Commits on Nov 29, 2013
- committed
- committed
Commits on Dec 25, 2013
Commits on Feb 6, 2014
- committed
- committed