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)
commitf0ec4cda4097105d396fcf6db7978c812c0a8190
treeeebe2a5d10484dc01e4943b94dca96cfbcf2be76
parent89e63a9c364cf38e75d52e2352130d54d32f8d55
parentde62b5f025602e63d2bbcff2023ca4d45812f49e
Merge branch 'master' of mop.mine.nu:brisk-img