From: Bdale Garbee Date: Sat, 14 Jul 2012 17:34:15 +0000 (-0600) 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=0356531021c1ef47d3d1de485a7c85cc0ae8c493;hp=d1da38237e126db02ad15ccd87b8df871ac4c036 Merge branch 'master' of ssh://git.gag.com/scm/git/web/gag.com --- diff --git a/bdale/talks/2011/debconf/AltosUI.odp b/bdale/talks/2011/debconf/AltosUI.odp new file mode 100644 index 0000000..51b1697 Binary files /dev/null and b/bdale/talks/2011/debconf/AltosUI.odp differ diff --git a/bdale/talks/2011/debconf/FreedomBox.odp b/bdale/talks/2011/debconf/FreedomBox.odp new file mode 100644 index 0000000..6007d03 Binary files /dev/null and b/bdale/talks/2011/debconf/FreedomBox.odp differ diff --git a/bdale/talks/2011/debconf/SPI.odp b/bdale/talks/2011/debconf/SPI.odp new file mode 100644 index 0000000..7d3b448 Binary files /dev/null and b/bdale/talks/2011/debconf/SPI.odp differ diff --git a/bdale/talks/2012/cyberpoint/TechTalk.odp b/bdale/talks/2012/cyberpoint/TechTalk.odp new file mode 100644 index 0000000..c3a03c8 Binary files /dev/null and b/bdale/talks/2012/cyberpoint/TechTalk.odp differ diff --git a/bdale/talks/2012/debconf/FreedomBox.odp b/bdale/talks/2012/debconf/FreedomBox.odp new file mode 100644 index 0000000..cf0ee29 Binary files /dev/null and b/bdale/talks/2012/debconf/FreedomBox.odp differ diff --git a/bdale/talks/2012/debconf/MeetTech.odp b/bdale/talks/2012/debconf/MeetTech.odp new file mode 100644 index 0000000..a97d0bd Binary files /dev/null and b/bdale/talks/2012/debconf/MeetTech.odp differ diff --git a/bdale/talks/2012/debconf/SPI.odp b/bdale/talks/2012/debconf/SPI.odp new file mode 100644 index 0000000..9f95b0c Binary files /dev/null and b/bdale/talks/2012/debconf/SPI.odp differ diff --git a/bdale/talks/2012/debconf/UnderstandingDebian.odp b/bdale/talks/2012/debconf/UnderstandingDebian.odp index b53d3fd..114bfa3 100644 Binary files a/bdale/talks/2012/debconf/UnderstandingDebian.odp and b/bdale/talks/2012/debconf/UnderstandingDebian.odp differ diff --git a/bdale/talks/2012/linuxcon-japan/FreedomBox.odp b/bdale/talks/2012/linuxcon-japan/FreedomBox.odp new file mode 100644 index 0000000..94bdfe8 Binary files /dev/null and b/bdale/talks/2012/linuxcon-japan/FreedomBox.odp differ