Merge branch 'develop' of cvs2:web/BigFore into develop
authorOve Klykken <klykken@gmail.com>
Mon, 14 Jul 2014 19:51:59 +0000 (15:51 -0400)
committerOve Klykken <klykken@gmail.com>
Mon, 14 Jul 2014 19:51:59 +0000 (15:51 -0400)

Trivial merge