Added 'getAllSentMessages' command to API
Added 'getSentMessageById' command to API
Changed received to 'lastActionTime' for 'getSentMessageById' command.
Added 'getAllInboxMessages' command to API.
Fixed indentation error.
Fixed indentation error (previous commit contained no files)
Merge pull request #224 from Atheros1/master

Translation and other merge requests
Merge pull request #225 from Atheros1/master

OS X Build script and 'add subscription from address book' option
Merge pull request #226 from Atheros1/master

'Save message as...' option in Inbox
Removed duplicate import statement for threading
Merge pull request #227 from pfista/master

Remove duplicate import statement
Added parameters check for getInboxMessageById and getSentMessageById API commands
Created API commands: 'trashInboxMessage' and 'trashSentMessage'. Also, identation fix caused by accidental tabs instead of spaces.
Merging with upstream and resolving conflicts
Merge remote-tracking branch 'upsteam/master'
Add getInboxMessagesByAddress API command
Merge pull request #222 from DivineOmega/master

Added 'getAllSentMessages' command to API
Merge branch 'api_improvements' of git://github.com/DivineOmega/PyBitmessage into DivineOmega-api_improvements
manual merge acejam-master
manual merge acejam-master