Merge branch 'master' of github.com:cjohansen/makeup master
authorChristian Johansen <christian@cjohansen.no>
Mon, 24 Mar 2014 19:17:27 +0000 (20:17 +0100)
committerChristian Johansen <christian@cjohansen.no>
Mon, 24 Mar 2014 19:17:27 +0000 (20:17 +0100)
commit7d36bf999180d8a8c081cadae0768aa378dc57fc
treea2c46512776433276216cdcafa78ab7d5c22319a
parented65e516fa3a3b4701b09178a82488218f019c26
parent6dd97b1df7a7bdbe3ae081348793fed60afd25ee
Merge branch 'master' of github.com:cjohansen/makeup