From: Bdale Garbee <bdale@gag.com>
Date: Sat, 3 Mar 2012 15:55:28 +0000 (-0700)
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=5f808ecd6f812961a52f81a6670af833cc9dc90c;hp=f738c27ee0fe2ad589800d98d60b3c070c3b41e6

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

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