Merge pull request #5 from tobeportable/patch-1
authorChristian Johansen <christian@cjohansen.no>
Sun, 16 Mar 2014 20:54:36 +0000 (21:54 +0100)
committerChristian Johansen <christian@cjohansen.no>
Sun, 16 Mar 2014 20:54:36 +0000 (21:54 +0100)
commit6dd97b1df7a7bdbe3ae081348793fed60afd25ee
treeace45efeda17bf211d0872e8736749d815a620ab
parentf404cf04df8a33612795f6ebf1f4f70929fde08c
parent13c3c8e1c840dbf40dd26c5f8352b79e20fcd15f
Merge pull request #5 from tobeportable/patch-1

Update makeup.rb