From: Bdale Garbee <bdale@gag.com>
Date: Fri, 5 Feb 2016 05:57:13 +0000 (+1100)
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=36ade9f4a109a6f6ebef35968d834dbcec838db8;hp=9eba2eafbe4db22256041e9b0fc10572d65fa160

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

diff --git a/bdale/talks/2016.mdwn b/bdale/talks/2016.mdwn
new file mode 100644
index 0000000..494f504
--- /dev/null
+++ b/bdale/talks/2016.mdwn
@@ -0,0 +1 @@
+[[!map pages="bdale/talks/2016/* and ! bdale/talks/2016/*/*"]]
diff --git a/bdale/talks/2016/lca.mdwn b/bdale/talks/2016/lca.mdwn
new file mode 100644
index 0000000..973cf2b
--- /dev/null
+++ b/bdale/talks/2016/lca.mdwn
@@ -0,0 +1 @@
+[[!map pages="bdale/talks/2016/lca/* and ! bdale/talks/2016/lca/*/*"]]