Merge branch 'brisk-fb-whois'
authorMatteo Nastasi <nastasi@alternativeoutput.it>
Thu, 6 Mar 2014 08:29:53 +0000 (09:29 +0100)
committerMatteo Nastasi <nastasi@alternativeoutput.it>
Thu, 6 Mar 2014 08:29:53 +0000 (09:29 +0100)

Trivial merge