Merge pull request #1749 from shackbarth/permalinks
authorTravis Webb <me@traviswebb.com>
Sat, 23 Aug 2014 03:15:57 +0000 (23:15 -0400)
committerTravis Webb <me@traviswebb.com>
Sat, 23 Aug 2014 03:15:57 +0000 (23:15 -0400)
Permalinks

1  2 
package.json

diff --cc package.json
Simple merge