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)
commitde62b5f025602e63d2bbcff2023ca4d45812f49e
tree7213fa225ed0dda1d12496b0c50fa5d3044a8408
parent030a19c0a64299cc705349a4c13a2f91213caf07
parentcc7d381fe4ec94a3ea53047cdffc56ffa77fe699
Merge branch 'master' of git.birds.lan:brisk-img