2 Commits

Author	SHA1	Message	Date
Brianna Laugher	40fa7b25c5	Merge branch 'master' of git://github.com/Elizaveta239/pytest into Elizaveta239-master ... Fixed merge conflict in CHANGELOG	2015-08-08 18:54:53 +02:00
Abhijeet Kasurde	e79413acc4	Updated documentation from txt to rst ... Signed-off-by: Abhijeet Kasurde <akasurde@redhat.com>	2015-08-04 16:41:02 +05:30