summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2013-10-12 14:52:53 +0200
committerJonas Smedegaard <dr@jones.dk>2013-10-12 14:52:53 +0200
commit52644b53374f54b5be99600d87aa468510dde288 (patch)
treecb1e71c540b9ff11d8c3a346be70381a013d4966
parentbbcbfc73b93614ea620b552a545fd889e6d45379 (diff)
parentccc9866cc6e4f35386a654d5eb66a71029b238b6 (diff)
parentad1b15bc336854512cb546b563549b420220b448 (diff)
parent7c7037c6eb652bdb6f894e6d996c3ed9bbd7bc13 (diff)
Merge branches 'bars', 'h1title-da', 'h5bp-da' and 'langsbottom' into master-da