Merge branch 'error_req_loop'
authorJean Privat <jean@pryen.org>
Thu, 6 Mar 2014 18:03:45 +0000 (13:03 -0500)
committerJean Privat <jean@pryen.org>
Thu, 6 Mar 2014 18:03:45 +0000 (13:03 -0500)

Trivial merge