Merge branch 'nikodemus-patch'
authorDavid Vázquez <davazp@gmail.com>
Mon, 6 May 2013 13:28:26 +0000 (14:28 +0100)
committerDavid Vázquez <davazp@gmail.com>
Mon, 6 May 2013 13:28:26 +0000 (14:28 +0100)
Closes #47


Trivial merge