Merge remote-tracking branch 'origin/flab' into generic
authorGit User <support@planet-lab.org>
Tue, 14 Oct 2014 07:18:43 +0000 (03:18 -0400)
committerGit User <support@planet-lab.org>
Tue, 14 Oct 2014 07:18:43 +0000 (03:18 -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