Merge branch 'master' of github.com:Trecenti/tech-radar
authorBruno Trecenti <btrecent@thoughtworks.com>
Fri, 21 Mar 2014 19:53:03 +0000 (16:53 -0300)
committerBruno Trecenti <btrecent@thoughtworks.com>
Fri, 21 Mar 2014 19:53:03 +0000 (16:53 -0300)

Trivial merge