Check that api methods return the correct result type
Update lib/mail.php

Added three additional mail_smtp.. parameters.
- mail_smtpdebug - enable debug messages to analyse SMTP problems.
- mail_smtptimeout - set SMTP timeout which is set to 10s by
  default and this is sometimes to short especially if a malware/
  spam scanner is used.
- mail_smtpsecure - force secure SMTP connections.
Update config/config.sample.php

Added three additional mail_smtp.. parameters.
- mail_smtpdebug - enable debug messages to analyse SMTP problems.
- mail_smtptimeout - set SMTP timeout which is set to 10s by
  default and this is sometimes to short especially if a malware/
  spam scanner is used.
- mail_smtpsecure - force secure SMTP connections.
Update config/config.sample.php

Fixed type in line 70. Thank you for pointing me to that typo.
Update config/config.sample.php

fixed an other typo.
[tx-robot] updated from transifex
Code style update
Merge pull request #1265 from j-ed/master

add additional mail_smtp.. parameters to fix possible SMTP connection problems.
Merge pull request #1286 from owncloud/ocs_api

Check that external api methods return instances of OC_OCS_Result
drop SimpleTest compatibility
Merge pull request #1291 from owncloud/drop-simpletest-compatibility-master

drop SimpleTest compatibility
[tx-robot] updated from transifex
Add js linkToRemote and linkToRemoteBase
Merge pull request #1307 from owncloud/js_linkToRemote

Add js linkToRemote and linkToRemoteBase
Merge branch 'master' into no-inline-js