Merge branch 'master' of github.com:benbalter/benbalter.github.com

benbalter · Dec 27, 2012 · db45f12 · db45f12
2 parents dc042d7 + 3189eed
commit db45f12
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/2012/12/26/securing-the-status-quo.json b/2012/12/26/securing-the-status-quo.json
diff --git a/feed.json b/feed.json