Merge branch 'master' into brisk
authorMatteo Nastasi (mop) <nastasi@alternativeoutput.it>
Sat, 27 Sep 2014 17:46:47 +0000 (19:46 +0200)
committerMatteo Nastasi (mop) <nastasi@alternativeoutput.it>
Sat, 27 Sep 2014 17:46:47 +0000 (19:46 +0200)
commitb248fce17bc2598406a52da26d80537b8f87f324
tree9701ef3ca23f2ddad55fc7b96a40bc8e7b3cff10
parent41b94cddd80575eed84a859ddd99a3a331aa446c
parentc7d496408f733c5cac096cd7ebebdeaeaf3d051c
Merge branch 'master' into brisk