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)
commitdd009e4ab6b8563252f328ffdb6befa8210127b2
tree8f10316ae25c303881921b82713a9caf626100cc
parent9bc9d7edc40c65d7803043f01e4db2389d5e0211
parent42a1f2ea0fc0080c3ff274442e5a12ad6c8c091e
Merge branch 'special-variables' into development