From: Bdale Garbee <bdale@gag.com>
Date: Thu, 22 Nov 2012 23:16:11 +0000 (-0700)
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=2a61477d420c8bcaa2f8828f15cf49fa5ea0e2ef;hp=cf36e567605e7c4c502f128812931fa0e500fb35

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

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