Merge branch 'testing'
authorLucian Mogosanu <lucian.mogosanu@gmail.com>
Wed, 1 Jan 2014 22:04:48 +0000 (00:04 +0200)
committerLucian Mogosanu <lucian.mogosanu@gmail.com>
Wed, 1 Jan 2014 22:13:59 +0000 (00:13 +0200)
commitead6a675597aca8ad6e04a6e5741bb4c3a0b4eaa
tree9d45c0ce43fd7d5d129e30fdc4ea96d96ef6a3c8
parentce5dca3ce21f0d84d45941954dfcfc44d36882b8
parentd59f210eedd8ae1298b31a4ba5319670fdf1d681
Merge branch 'testing'

Conflicts:
css/default.css
css/default.css
templates/default.html