Merge remote-tracking branch 'origin/generic'
Git User [Mon, 29 Sep 2014 10:31:37 +0000 (06:31 -0400)]
generic.txt [new file with mode: 0644]

diff --git a/generic.txt b/generic.txt
new file mode 100644 (file)
index 0000000..6e8c89b
--- /dev/null
@@ -0,0 +1 @@
+adding another branch called generic