lektole/amadeus — pull request #1 by lektole (2012-08-04 18:59:14+00:00)
Title: Upstream

testando merge(?)