Merge branch 'master', remote branch 'origin' into auto-maintenance
authorMatteo Nastasi (mop) <nastasi@alternativeoutput.it>
Thu, 20 Mar 2014 06:42:23 +0000 (07:42 +0100)
committerMatteo Nastasi (mop) <nastasi@alternativeoutput.it>
Thu, 20 Mar 2014 06:42:23 +0000 (07:42 +0100)

Trivial merge