agrajaghh 6f600a80b8 fix merge conflict between #2743 and #2746 ... Closes #2789 //FREEBIE		2015-03-25 13:28:57 -07:00
..
thoughtcrime/securesms	fix merge conflict between #2743 and #2746	2015-03-25 13:28:57 -07:00