Merge branch 'master' of git.birds.lan:brisk-img
authorMatteo Nastasi <nastasi@alternativeoutput.it>
Fri, 21 Dec 2012 12:08:37 +0000 (13:08 +0100)
committerMatteo Nastasi <nastasi@alternativeoutput.it>
Fri, 21 Dec 2012 12:08:37 +0000 (13:08 +0100)

Trivial merge