Merge branch 'master' of git.birds.lan:brisk-img
authorMatteo Nastasi <nastasi@alternativeoutput.it>
Mon, 26 Aug 2013 06:13:48 +0000 (08:13 +0200)
committerMatteo Nastasi <nastasi@alternativeoutput.it>
Mon, 26 Aug 2013 06:13:48 +0000 (08:13 +0200)

Trivial merge