Merge branch 'master' of git://github.com/andrzejsliwa/coffeeapp

Conflicts: README.markdown
andrzejsliwa · Sep 16, 2011 · 1199d15 · 1199d15
2 parents 2e47e72 + 58abd31
commit 1199d15
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/README.markdown b/README.markdown
@@ -181,3 +181,4 @@ Andrzej Sliwa, andrzej.sliwa@i-tool.eu
 ### Contributors
 
 Josh Bohde, josh.bohde@gmail.com
+Szaby Grünwald, https://github.com/szabyg