Merge pull request #1897 from gpazo/bumpin470
authorSteve Hackbarth <stephenhackbarth@gmail.com>
Fri, 3 Oct 2014 14:07:00 +0000 (10:07 -0400)
committerSteve Hackbarth <stephenhackbarth@gmail.com>
Fri, 3 Oct 2014 14:07:00 +0000 (10:07 -0400)
Bumpin470

1  2 
package.json

diff --cc package.json
Simple merge