Merge branch 'gh-pages' into diagram-update-theme-fix
authorjordanmccullough <jordan@github.com>
Tue, 24 Sep 2013 16:13:33 +0000 (10:13 -0600)
committerjordanmccullough <jordan@github.com>
Tue, 24 Sep 2013 16:13:33 +0000 (10:13 -0600)
commitba9d671645f6ed7b30b6218c4299984c239767ce
tree4548e96c1535cd19ad00803eddf9df95ea837510
parent56766447f378f408c77b29d4e62436ca16cc033b
parent49bc0e36e23ecfc7c1fe34bf735bd77d045bf3d9
Merge branch 'gh-pages' into diagram-update-theme-fix

Reverse merge to update out-of-date branch.
presentations/_posts/foundations/rebase/0002-01-01-Fast-Forward.md
presentations/_posts/foundations/rebase/0004-01-01-Interactive.md