Merge branch 'intro'
authorAntony Chazapis <chazapis@gmail.com>
Tue, 15 Nov 2011 09:40:19 +0000 (11:40 +0200)
committerAntony Chazapis <chazapis@gmail.com>
Tue, 15 Nov 2011 09:40:19 +0000 (11:40 +0200)

Trivial merge