Merge branch 'develop' of cvs2:web/BigFore into develop
authorOve Klykken <klykken@gmail.com>
Tue, 15 Jul 2014 15:19:49 +0000 (11:19 -0400)
committerOve Klykken <klykken@gmail.com>
Tue, 15 Jul 2014 15:19:49 +0000 (11:19 -0400)
1  2 
templates/template.html

Simple merge