Permalink
Browse files

Merge branch 'gh-pages' of github.com:dmfrancisco/slideshow.html into…

… gh-pages

Conflicts:
	index.html
  • Loading branch information...
2 parents ed5217d + 03412c8 commit 72751b582b0430672c5e36efa3441f700de7a649 @dmfrancisco committed Aug 10, 2011
Showing with 0 additions and 0 deletions.

0 comments on commit 72751b5

Please sign in to comment.