Merge branch 'develop' of cvs2.gaslightmedia.com:web/SooLocks into develop
authorOve Klykken <klykken@gmail.com>
Thu, 12 Jun 2014 14:55:22 +0000 (10:55 -0400)
committerOve Klykken <klykken@gmail.com>
Thu, 12 Jun 2014 14:55:22 +0000 (10:55 -0400)
1  2 
templates/template.html

Simple merge