Merge branch 'master' of git://kenny.imendio.com/micke/giggle