Automated commit at 2014-02-11 16:08:51 UTC by middleman-deploy 3.0.13
Automated commit at 2014-02-11 16:10:04 UTC by middleman-deploy 3.0.13
Automated commit at 2014-02-12 22:28:18 UTC by middleman-deploy 3.0.13
Automated commit at 2014-02-12 22:31:40 UTC by middleman-deploy 3.0.13
Automated commit at 2014-02-12 23:02:40 UTC by middleman-deploy 3.0.13
Automated commit at 2014-02-12 23:05:06 UTC by middleman-deploy 3.0.13
fix merge conflict