tree b138168daf47b3ab53172cebcd755b83a52435c0
parent 4ae486fbcf0af0709666ff23b8e45a169aa732ba
parent 14a77f2fd14f740cea663c0af3e83718702736d8
author JJ Allaire <jj@rstudio.org> 1458727728 -0400
committer JJ Allaire <jj@rstudio.org> 1458727728 -0400

Merge branch 'master' of github.com:rstudio/revealjs