Merge branch 'master' of mop.mine.nu:brisk-img
authorMatteo Nastasi (mop) <nastasi@alternativeoutput.it>
Tue, 1 Jan 2013 11:55:00 +0000 (12:55 +0100)
committerMatteo Nastasi (mop) <nastasi@alternativeoutput.it>
Tue, 1 Jan 2013 11:55:00 +0000 (12:55 +0100)

Trivial merge