Merge branch 'develop' of cvs2:web/BigFore into develop
authorOve Klykken <klykken@gmail.com>
Thu, 17 Jul 2014 14:47:50 +0000 (10:47 -0400)
committerOve Klykken <klykken@gmail.com>
Thu, 17 Jul 2014 14:47:50 +0000 (10:47 -0400)

Trivial merge