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
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'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
various changes to 'messages expire' pull request
Refactored some table items to remove the universal unreadable variable 'new_item'
further work on 'messages expire' feature
delete class_sqlThread.py.orig
Merge pull request #548 from Atheros1/master

Message Expire
Fix #472