Merge remote-tracking branch 'ivan/feature/common-code-to-base-config' into develop
authorTomás Touceda <chiiph@leap.se>
Wed, 7 Aug 2013 17:58:33 +0000 (14:58 -0300)
committerTomás Touceda <chiiph@leap.se>
Wed, 7 Aug 2013 17:58:33 +0000 (14:58 -0300)

Trivial merge