Merge remote-tracking branch 'origin/stable-2.0'
authorMark H Weaver <mhw@netris.org>
Thu, 15 Aug 2013 08:09:04 +0000 (04:09 -0400)
committerMark H Weaver <mhw@netris.org>
Thu, 15 Aug 2013 08:09:04 +0000 (04:09 -0400)
commit521c542199afa4f199746d5bbffc18a988cb30bc
treebe801b18b08edf4982a659be78eba68b2fd11f23
parentf499d6e31a8554b3191c80c0e8c25e274ee5671d
parent8d5d0425ce10dcf035fbf717852938291261bd7e
Merge remote-tracking branch 'origin/stable-2.0'
module/Makefile.am