Merge remote-tracking branch 'origin/stable-2.0'
authorMark H Weaver <mhw@netris.org>
Tue, 16 Jul 2013 05:48:19 +0000 (01:48 -0400)
committerMark H Weaver <mhw@netris.org>
Tue, 16 Jul 2013 05:48:19 +0000 (01:48 -0400)
commit3c2fe0ac03c1d9a2cf0cf595fb13ce0f73f21563
tree72225cba5a113160c5b2762692aeb19be1398e8c
parent28d5d2537c0321643c3b511a2195cd491204e7f2
parent284859c2f9b7072dd0bc1215d43663bb87858025
Merge remote-tracking branch 'origin/stable-2.0'