projects / blog / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ffba2c1 5fb6fb3)
Merge branch 'master' into gh-pages
authorMark Otto <otto@github.com>
Thu, 2 Jan 2014 18:27:29 +0000 (10:27 -0800)
committerMark Otto <otto@github.com>
Thu, 2 Jan 2014 18:27:29 +0000 (10:27 -0800)

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.