From: Bdale Garbee <bdale@gag.com>
Date: Sun, 20 May 2012 15:36:04 +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=490496352fe6ca4576d32b22ae3242d945b3227d;hp=52ccc0b63b1e6cba7f30f426fda39e891e7a957e

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

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