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 (file)
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 (file)
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/*/*"]]