10 commits

Author	SHA1	Message	Date
Jannes Höke	d940afa718	merge master into cr4.0	2016-04-29 18:37:41 +02:00
Noam Meltzer	e160355190	remove unused imports, use future for urllib imports	2016-04-28 01:41:32 +03:00
Leandro Toledo	35f6de326b	Add InlineKeyboardButtonTest and reformatting.	2016-04-26 18:23:15 -03:00
Leandro Toledo	ca1fff25f7	Some code reformat and minor fixes	2016-04-23 23:11:25 -03:00
leandrotoledo	ba0ea4f268	Add TOKEN and CHAT_ID for testing in favor of #221	2016-03-31 15:36:18 -03:00
Noam Meltzer	e0cf0abb1b	flaky tests: try up to 3 times, need to succeed once	2016-02-22 01:52:31 +02:00
Noam Meltzer	ec13a36bdd	unitests: use home brewed timeout for tests	2016-02-22 01:38:26 +02:00
Jannes Höke	aa8966832b	release 3.2 and update copyright notice to 2015-2016	2016-01-05 14:12:03 +01:00
Jannes Höke	ea7c54ba07	Release v3.1.1, change author email everywhere	2015-12-21 21:18:53 +01:00
leandrotoledo	1b0c3731de	Update Base tests class	2015-09-07 14:12:58 -03:00