From: Bdale Garbee <bdale@gag.com>
Date: Wed, 3 Sep 2014 03:17:44 +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=76565e8a0338bdb65404e0c1ba6546f41b2a393d;hp=5fef2212d7e10856fe013cbf18655b6da83b12fa

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

diff --git a/bdale/talks/2014.mdwn b/bdale/talks/2014.mdwn
new file mode 100644
index 0000000..8695e8b
--- /dev/null
+++ b/bdale/talks/2014.mdwn
@@ -0,0 +1 @@
+[[!map pages="bdale/talks/2014/* and ! bdale/talks/2014/*/*"]]
diff --git a/bdale/talks/2014/debconf.mdwn b/bdale/talks/2014/debconf.mdwn
new file mode 100644
index 0000000..4a1eb3d
--- /dev/null
+++ b/bdale/talks/2014/debconf.mdwn
@@ -0,0 +1 @@
+[[!map pages="bdale/talks/2014/debconf/* and ! bdale/talks/2014/debconf/*/*"]]