From: Don Armstrong <don@donarmstrong.com>
Date: Sun, 12 May 2013 16:57:20 +0000 (-0700)
Subject: Merge branch 'master' of git+ssh://linnode.donarmstrong.com/sites/tiepenguins/tiepenguins
X-Git-Url: https://git.donarmstrong.com/?p=tiepenguins.git;a=commitdiff_plain;h=294f0b90c48801e3885ceec7dd3787e2e52732eb;hp=00268ab6b7712ba7bc4b0c26cdcab54ad9e67622

Merge branch 'master' of git+ssh://linnode.donarmstrong.com/sites/tiepenguins/tiepenguins
---

diff --git a/tag/scrimmage.mdwn b/tag/scrimmage.mdwn
new file mode 100644
index 0000000..a2f50c7
--- /dev/null
+++ b/tag/scrimmage.mdwn
@@ -0,0 +1,4 @@
+[[!meta title="pages tagged scrimmage"]]
+
+[[!inline pages="tagged(scrimmage)" actions="no" archive="yes"
+feedshow=10]]
diff --git a/tag/video.mdwn b/tag/video.mdwn
new file mode 100644
index 0000000..f5f7c4d
--- /dev/null
+++ b/tag/video.mdwn
@@ -0,0 +1,4 @@
+[[!meta title="pages tagged video"]]
+
+[[!inline pages="tagged(video)" actions="no" archive="yes"
+feedshow=10]]