Merge branch 'feature/template' into develop
authorOve Klykken <klykken@gmail.com>
Tue, 10 Jun 2014 18:26:45 +0000 (14:26 -0400)
committerOve Klykken <klykken@gmail.com>
Tue, 10 Jun 2014 18:26:45 +0000 (14:26 -0400)
commit71bb20cf05db17193551d5e9de4ae539e06ba25f
treea3c0949fe1626c0ef0ebbd89c334a6431d2d7b7b
parent8d986a09cb281cff22a532b2f376419b041a0af9
parent59826b45056c56518db45676b2f61ca8933c75cd
Merge branch 'feature/template' into develop