Merge remote-tracking branch 'ivan/feature/add-existing-files'
authorTomás Touceda <chiiph@leap.se>
Tue, 14 Jan 2014 16:07:03 +0000 (13:07 -0300)
committerTomás Touceda <chiiph@leap.se>
Tue, 14 Jan 2014 16:07:03 +0000 (13:07 -0300)

Trivial merge