Merge remote-tracking branch 'ivan/feature/3030_baseconfig-tests' into develop
authorTomás Touceda <chiiph@leap.se>
Thu, 4 Jul 2013 14:37:14 +0000 (11:37 -0300)
committerTomás Touceda <chiiph@leap.se>
Thu, 4 Jul 2013 14:37:14 +0000 (11:37 -0300)

Trivial merge