Merge branch 'special-variables' into development
authorDavid Vazquez <davazp@gmail.com>
Wed, 16 Jan 2013 21:21:51 +0000 (21:21 +0000)
committerDavid Vazquez <davazp@gmail.com>
Wed, 16 Jan 2013 21:21:51 +0000 (21:21 +0000)

Trivial merge