Merge branch 'master' into newmc
authorMarius Gavrilescu <marius@ieval.ro>
Wed, 25 Feb 2015 18:04:07 +0000 (20:04 +0200)
committerMarius Gavrilescu <marius@ieval.ro>
Wed, 25 Feb 2015 18:04:07 +0000 (20:04 +0200)
commit750b40cb7cf4c9dbf2b85c18e3d0db172441facd
tree25bd24b98f23ad9dd2ae09eb86a3947481f3b274
parentf2d78743a891311cf02a3a80a60c8a1ddc72b98e
parent42243f04db2175b78c83c50aa1aa82bc14d7a00b
Merge branch 'master' into newmc

Conflicts:
lib/Plack/App/Gruntmaster.pm
lib/Plack/App/Gruntmaster/HTML.pm
This page took 0.009722 seconds and 4 git commands to generate.