Merge branch 'master' of mop.mine.nu:brisk-img
authorMatteo Nastasi (mop) <nastasi@alternativeoutput.it>
Mon, 4 Mar 2013 10:20:05 +0000 (11:20 +0100)
committerMatteo Nastasi (mop) <nastasi@alternativeoutput.it>
Mon, 4 Mar 2013 10:20:05 +0000 (11:20 +0100)

Trivial merge