Updated imap adapter configuration options
Merge remote-tracking branch 'upstream/master'
Spanish 4th: fixed syntax issues and missing translations
5th edition, published
Updated postgresql topic taking Ubuntu 12.04 as reference and adding permission topics
Merge pull request #40 from alfonsodg/master

Improving some postgresql references
Merge pull request #38 from spametki/master

Spanish translation, 4th. Fixed syntax and missing translations in chapters 00-04
Spanish translation of The Views
Merge pull request #42 from spametki/master

The Views: spanish translation complete
merged changes from upstream
Merge branch 'master' into corrections