taler-www

commit 44a2852fe0894351be1e2fc41202e867a395faf4
parent 6621699a7df61b2a2761ed55368234f4451730d6
Author: Christian Grothoff <christian@grothoff.org>
Date:   Sun, 17 Jan 2016 00:08:25 +0100

Merge branch 'master' of taler.net:/var/git/www


Former-commit-id: 3778c028275cc337cbdb82b72baf664d67a6061c
Diffstat:
A
videos/grothoff2014fossa.ogv.REMOVED.git-id
 | 
2
++
A
videos/grothoff2014fossa.webm.REMOVED.git-id
 | 
2
++

2 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/videos/grothoff2014fossa.ogv.REMOVED.git-id b/videos/grothoff2014fossa.ogv.REMOVED.git-id
@@ -0,0 +1 @@
+9c4c6df94e08531362034ec947a813db27ca6066
+\ No newline at end of file
diff --git a/videos/grothoff2014fossa.webm.REMOVED.git-id b/videos/grothoff2014fossa.webm.REMOVED.git-id
@@ -0,0 +1 @@
+7398eccda11722b00eb0ce8a5c80ed517fb061ae
+\ No newline at end of file