Merge branch 'for-3.10' into 'for-3.11'
authorJ. Bruce Fields <bfields@redhat.com>
Mon, 1 Jul 2013 21:22:14 +0000 (17:22 -0400)
committerJ. Bruce Fields <bfields@redhat.com>
Mon, 1 Jul 2013 21:22:24 +0000 (17:22 -0400)
commit0de934936b731ca49ece266284da3c7cb402c74e
tree70aa071d779de71d04585f8d4325c230f231aba8
parent1a9357f443d64aa41e9b0dc414953663a6fcca19
parentafe3c3fd5392b2f0066930abc5dbd3f4b14a0f13
Merge branch 'for-3.10' into 'for-3.11'

Merge bugfixes into my for-3.11 branch.