From: Bdale Garbee <bdale@gag.com>
Date: Sat, 14 Jul 2012 17:34:15 +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=0356531021c1ef47d3d1de485a7c85cc0ae8c493;hp=b7a181f708289f55a1c7fcf52e4fcd8b212cefd8

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

diff --git a/bdale/talks/2012/debconf.mdwn b/bdale/talks/2012/debconf.mdwn
new file mode 100644
index 0000000..e09230b
--- /dev/null
+++ b/bdale/talks/2012/debconf.mdwn
@@ -0,0 +1 @@
+[[!map pages="bdale/talks/2012/debconf/* and ! bdale/talks/2012/debconf/*/*"]]
diff --git a/bdale/talks/2012/linuxcon-japan.mdwn b/bdale/talks/2012/linuxcon-japan.mdwn
new file mode 100644
index 0000000..e6a0d79
--- /dev/null
+++ b/bdale/talks/2012/linuxcon-japan.mdwn
@@ -0,0 +1 @@
+[[!map pages="bdale/talks/2012/linuxcon-japan/* and ! bdale/talks/2012/linuxcon-japan/*/*"]]