From: Bdale Garbee <bdale@gag.com>
Date: Thu, 19 Jan 2012 00:10:26 +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=23cd240cd41d86ad5adcabee351614e478363cdd;hp=ad7f763cfe22d8d52f4efbc6ec5d9c3494d6db36

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

diff --git a/bdale/talks/2011/linuxcon-brazil.mdwn b/bdale/talks/2011/linuxcon-brazil.mdwn
new file mode 100644
index 0000000..45422cc
--- /dev/null
+++ b/bdale/talks/2011/linuxcon-brazil.mdwn
@@ -0,0 +1 @@
+[[!map pages="bdale/talks/2011/linuxcon-brazil/* and ! bdale/talks/2011/linuxcon-brazil/*/*"]]
diff --git a/bdale/talks/2011/linuxcon-europe.mdwn b/bdale/talks/2011/linuxcon-europe.mdwn
new file mode 100644
index 0000000..f2cde4b
--- /dev/null
+++ b/bdale/talks/2011/linuxcon-europe.mdwn
@@ -0,0 +1 @@
+[[!map pages="bdale/talks/2011/linuxcon-europe/* and ! bdale/talks/2011/linuxcon-europe/*/*"]]
diff --git a/bdale/talks/2011/linuxcon.mdwn b/bdale/talks/2011/linuxcon.mdwn
new file mode 100644
index 0000000..ecf04a9
--- /dev/null
+++ b/bdale/talks/2011/linuxcon.mdwn
@@ -0,0 +1 @@
+[[!map pages="bdale/talks/2011/linuxcon/* and ! bdale/talks/2011/linuxcon/*/*"]]
diff --git a/bdale/talks/2011/wif.mdwn b/bdale/talks/2011/wif.mdwn
new file mode 100644
index 0000000..7b729bb
--- /dev/null
+++ b/bdale/talks/2011/wif.mdwn
@@ -0,0 +1 @@
+[[!map pages="bdale/talks/2011/wif/* and ! bdale/talks/2011/wif/*/*"]]