test to check git usage
New tab "Adjusting time period for resending messages" was added
minor change UI
changes in keys.dat, edit hours/days/months is working now, variable time_period inserted
feature_v1
feature_v2
feature1_v3_AQWA
merged
feature1_v4
== should be =
Merge pull request #523 from johnkozan/patch-1

== should be =
AQWA feature: UI setting for Bitmessage to stop trying to send messages after X hours/days/months
Merge pull request #2 from MasdarAQWA/master

AQWA feature1: UI setting to stop trying to send messages after X hours/days/months
Merge remote-tracking branch 'upstream/master'
Fixed typo in getInboxMessagesByAddress
Merge pull request #525 from acejam/master

Fixed typo in getInboxMessagesByAddress
Merge remote-tracking branch 'upstream/master'
Don't store messages in UI table (and thus in memory), pull from SQL inventory as needed
check return value of RAND_bytes
Use SQL-stored message when using 'Display as HTML' feature