From: Bdale Garbee <bdale@gag.com>
Date: Mon, 8 Apr 2013 21:46:57 +0000 (-0600)
Subject: Merge branch 'master' of ssh://git.gag.com/scm/git/web/gag.com
X-Git-Url: https://git.gag.com/?p=web%2Fgag.com;a=commitdiff_plain;h=e68f01263cc81034d34944a9bb85156fde2d5fbb;hp=17c4c3533fbf239d4bb7b7ea630e431b86beecfe

Merge branch 'master' of ssh://git.gag.com/scm/git/web/gag.com
---

diff --git a/bdale/talks/2013.mdwn b/bdale/talks/2013.mdwn
new file mode 100644
index 0000000..74ff86e
--- /dev/null
+++ b/bdale/talks/2013.mdwn
@@ -0,0 +1 @@
+[[!map pages="bdale/talks/2013/* and ! bdale/talks/2013/*/*"]]
diff --git a/bdale/talks/2013/posscon.mdwn b/bdale/talks/2013/posscon.mdwn
new file mode 100644
index 0000000..c2aa130
--- /dev/null
+++ b/bdale/talks/2013/posscon.mdwn
@@ -0,0 +1 @@
+[[!map pages="bdale/talks/2013/posscon/* and ! bdale/talks/2013/posscon/*/*"]]