aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2014-06-12Merge branch 'master' of alias.im:guillaume/clo