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

Trivial merge