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