From: Bdale Garbee 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=8cf45d596e2819ad903cc62f54671d98800a53b3 Merge branch 'master' of ssh://git.gag.com/scm/git/web/gag.com --- diff --git a/bdale/talks/2012/lca/FreedomBox.odp b/bdale/talks/2012/lca/FreedomBox.odp index 4fbdd7f..95a03f9 100644 Binary files a/bdale/talks/2012/lca/FreedomBox.odp and b/bdale/talks/2012/lca/FreedomBox.odp differ