Merge branch '0.1'

2014-11-27 16:18:56 -08:00 · 2014-11-27 16:18:56 -08:00 · fb7bf27242
parent b3b3b06ae3 8b04db44b9
commit fb7bf27242
2 changed files with 2 additions and 1 deletions
--- a/1
+++ b/1
@ -0,0 +1 @@
+This is a new feature.
--- a/2
+++ b/2
@ -1 +1 @@
-This is master 0.1
+This is release 0.1