Merge branch 'prerelease' into multi-lib
commit96055def766e9fe682a21254c9e1a8f451aa9d17
authorNick Parker <nparker@zetetic.net>
Tue, 11 Jun 2013 16:36:10 +0000 (11 11:36 -0500)
committerNick Parker <nparker@zetetic.net>
Tue, 11 Jun 2013 16:36:10 +0000 (11 11:36 -0500)
treee424175a29fa37a5eea731655ed91da730fbae7f
parent51f2855d36ca8233b7e8a39e37f3d0d8f16520f1
parent878f82a09cb66dcbafeed2705fcee409156b76fc
Merge branch 'prerelease' into multi-lib