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)

Trivial merge