Merge remote-tracking branch 'ivan/bug/3606_make-base-config-test-pass' into develop
authorTomás Touceda <chiiph@leap.se>
Fri, 30 Aug 2013 17:45:31 +0000 (14:45 -0300)
committerTomás Touceda <chiiph@leap.se>
Fri, 30 Aug 2013 17:45:31 +0000 (14:45 -0300)
commit03e5e612103bf129602032065cfe5917b8de8be5
treea9a17c301440c89e6ffdba40f2eb1d33bd99caa7
parentf6b4491f972124271639af80f52f4b6dd6c056ba
parent0aeced28f7e8c87d59e9a057b6aea9bdcd37fc02
Merge remote-tracking branch 'ivan/bug/3606_make-base-config-test-pass' into develop