Merge remote-tracking branch 'origin/16-new-names' into next
authorChristopher Peplin <chris.peplin@rhubarbtech.com>
Tue, 7 Oct 2014 03:10:57 +0000 (23:10 -0400)
committerChristopher Peplin <chris.peplin@rhubarbtech.com>
Tue, 7 Oct 2014 03:10:57 +0000 (23:10 -0400)
commitfde9efb8224468dd8fb3c6204a7e80a9dd38a97c
treeddb787aa241453331bb9358ada5e28601000ab0d
parent28c895ef2fc4e152c506b0965d8f1830f848870e
parent8416597aecd8b3e97a016e9240d9b3fa640c0a07
Merge remote-tracking branch 'origin/16-new-names' into next

Conflicts:
README.md
JSON.mkd