Merge branch 'develop'

ophentis · Dec 16, 2011 · 36e6945 · 36e6945
2 parents 056319b + 2acc8ae
commit 36e6945
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/hello.js b/hello.js
@@ -1 +1,2 @@
 console.log('hi')
+console.log('faster-forward')