Merge branch 'master' into rebarify-15688
authorDavid Reid <dreid@mochimedia.com>
Thu, 11 Nov 2010 18:11:11 +0000 (10:11 -0800)
committerDavid Reid <dreid@mochimedia.com>
Thu, 11 Nov 2010 18:11:11 +0000 (10:11 -0800)
commitdb6c33943ec59c8ddfc57030d2d3d3d09ff41ddf
tree1bc970ac7a5b2a9ca4f1452a09e188985c42776b
parent99957246bdec7f76c615f6070609fe45bcdda576
parent9b8d6fe54f52fbf5cb3312efb700fc4069fdceeb
Merge branch 'master' into rebarify-15688

Conflicts:
.gitignore
README
support/include.mk
support/make_app.escript
.gitignore
README