Merge branch 'master' into gh-pages
authorDavid Vazquez <davazp@gmail.com>
Fri, 18 Jan 2013 23:32:35 +0000 (23:32 +0000)
committerDavid Vazquez <davazp@gmail.com>
Fri, 18 Jan 2013 23:32:35 +0000 (23:32 +0000)
commit414c91b4437d72f3029a035276876f7862ef6790
tree68be2dcdb6f8f75700555c63db650ad886715113
parent081498ccd5014fe33fe46922b324fd9a44b85172
parentf9c561d081a1dda0da989db182dc9b50f2ecc208
Merge branch 'master' into gh-pages