Merge remote-tracking branch 'ivan/feature/3574_path-prefix-with-dirspec' into develop
authorTomás Touceda <chiiph@leap.se>
Wed, 28 Aug 2013 18:45:53 +0000 (15:45 -0300)
committerTomás Touceda <chiiph@leap.se>
Wed, 28 Aug 2013 18:45:53 +0000 (15:45 -0300)

Trivial merge