Permalink
Browse files

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

Conflicts:
	README.markdown
  • Loading branch information...
2 parents 2e47e72 + 58abd31 commit 1199d15e6af7196cff1aca2290984dfdfa1b58e0 Szaby Grünwald committed Sep 16, 2011
Showing with 1 addition and 0 deletions.
  1. +1 −0 README.markdown
View
@@ -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

0 comments on commit 1199d15

Please sign in to comment.