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)
commit1c940ff5979bb770a98f8d19e96c046281393134
tree5b5060b0a877ed349c37721dd6d0460c0a04cea9
parent9a6a3610c8def87870966a6f7745340f26e4dc07
parent62a35b31224a416a34a492a7edf3cef5496bddc6
Merge branch 'master' into gh-pages