Merge branch 'master' into gh-pages
authorDavid Vazquez <davazp@gmail.com>
Sat, 19 Jan 2013 02:03:22 +0000 (02:03 +0000)
committerDavid Vazquez <davazp@gmail.com>
Sat, 19 Jan 2013 02:03:22 +0000 (02:03 +0000)

Trivial merge