Merge branch 'sac-a-push' of mop.mine.nu:brisk into sac-a-push
authorMatteo Nastasi (mop) <nastasi@alternativeoutput.it>
Sat, 10 Nov 2012 23:29:20 +0000 (00:29 +0100)
committerMatteo Nastasi (mop) <nastasi@alternativeoutput.it>
Sat, 10 Nov 2012 23:29:20 +0000 (00:29 +0100)

Trivial merge