Merge branch 'upstream' into staging/rails-4.0

Author: darkbushido

.mailmap

@@ -1,41 +1,45 @@
 bcook-r7 <bcook-r7@github>         Brent Cook <[email protected]>
 bturner-r7 <bturner-r7@github>     Brandon Turner <[email protected]>
+ccatalan-r7 <ccatalan-r7@github>   Christian Catalan <[email protected]>
 cdoughty-r7 <cdoughty-r7@github>   Chris Doughty <[email protected]>
 dheiland-r7 <dheiland-r7@github>   Deral Heiland <[email protected]>
-dmaloney-r7 <dmaloney-r7@github>   David Maloney <[email protected]>
 dmaloney-r7 <dmaloney-r7@github>   David Maloney <[email protected]>
+dmaloney-r7 <dmaloney-r7@github>   David Maloney <[email protected]>
 dmaloney-r7 <dmaloney-r7@github>   dmaloney-r7 <[email protected]>
 ecarey-r7 <ecarey-r7@github>       Erran Carey <[email protected]>
 farias-r7 <farias-r7@github>       Fernando Arias <[email protected]>
 hmoore-r7 <hmoore-r7@github>       HD Moore <[email protected]>
 hmoore-r7 <hmoore-r7@github>       HD Moore <[email protected]>
 jhart-r7 <jhart-r7@github>         Jon Hart <[email protected]>
-jlee-r7 <jlee-r7@github>           egypt <[email protected]> # aka egypt
-jlee-r7 <jlee-r7@github>           James Lee <[email protected]> # aka egypt
 jlee-r7 <jlee-r7@github>           James Lee <[email protected]>
+jlee-r7 <jlee-r7@github>           James Lee <[email protected]> # aka egypt
+jlee-r7 <jlee-r7@github>           egypt <[email protected]> # aka egypt
 jvazquez-r7 <jvazquez-r7@github>   jvazquez-r7 <[email protected]>
 jvazquez-r7 <jvazquez-r7@github>   jvazquez-r7 <[email protected]>
 kgray-r7 <kgray-r7@github>         Kyle Gray <[email protected]>
 limhoff-r7 <limhoff-r7@github>     Luke Imhoff <[email protected]>
-lsanchez-r7 <lsanchez-r7@github>   darkbushido <[email protected]>
 lsanchez-r7 <lsanchez-r7@github>   Lance Sanchez <[email protected]>
 lsanchez-r7 <lsanchez-r7@github>   Lance Sanchez <[email protected]>
-lsanchez-r7 <lsanchez-r7@github>   Lance Sanchez <[email protected]>
 lsanchez-r7 <lsanchez-r7@github>   Lance Sanchez <[email protected]>
+lsanchez-r7 <lsanchez-r7@github>   Lance Sanchez <[email protected]>
+lsanchez-r7 <lsanchez-r7@github>   darkbushido <[email protected]>
 mbuck-r7 <mbuck-r7@github>         Matt Buck <[email protected]>
 mbuck-r7 <mbuck-r7@github>         Matt Buck <[email protected]>
 mschloesser-r7 <mschloesser-r7@github> Mark Schloesser <[email protected]>
 mschloesser-r7 <mschloesser-r7@github> mschloesser-r7 <[email protected]>
 parzamendi-r7 <parzamendi-r7@github> parzamendi-r7 <[email protected]>
+pdeardorff-r7 <pdeardorff-r7@github> Paul Deardorff <[email protected]>
+pdeardorff-r7 <pdeardorff-r7@github> pdeardorff-r7 <[email protected]>
+sgonzalez-r7 <sgonzalez-r7@github> Sonny Gonzalez <[email protected]>
 shuckins-r7 <shuckins-r7@github>   Samuel Huckins <[email protected]>
 todb-r7 <todb-r7@github>           Tod Beardsley <[email protected]>
 todb-r7 <todb-r7@github>           Tod Beardsley <[email protected]>
 todb-r7 <todb-r7@github>           Tod Beardsley <[email protected]>
-trosen-r7 <trosen-r7@github>       Trevor Rosen <[email protected]>
 trosen-r7 <trosen-r7@github>       Trevor Rosen <[email protected]>
+trosen-r7 <trosen-r7@github>       Trevor Rosen <[email protected]>
+wchen-r7 <wchen-r7@github>         Wei Chen <[email protected]>
 wchen-r7 <wchen-r7@github>         sinn3r <[email protected]> # aka sinn3r
 wchen-r7 <wchen-r7@github>         sinn3r <[email protected]>
-wchen-r7 <wchen-r7@github>         Wei Chen <[email protected]>
 wvu-r7 <wvu-r7@github>             William Vu <[email protected]>
 wvu-r7 <wvu-r7@github>             William Vu <[email protected]>
 wvu-r7 <wvu-r7@github>             William Vu <[email protected]>

data/exploits/CVE-2014-8440/msf.swf

@@ -1,7 +1,14 @@
-Alphanetworks wrgg19_c_dlwbr_dir300 
+Alphanetworks wrgg19_c_dlwbr_dir300
 Alphanetworks wrgn49_dlob_dir600b
 Alphanetworks wrgn23_dlwbr_dir600b
 Alphanetworks wrgn22_dlwbr_dir615
 Alphanetworks wrgnd08_dlob_dir815
 Alphanetworks wrgg15_di524
-Alphanetworks wrgn39_dlob.hans_dir645
+Alphanetworks wrgn39_dlob.hans_dir645
+Alphanetworks wapnd03cm_dkbs_dap2555
+Alphanetworks wapnd04cm_dkbs_dap3525
+Alphanetworks wapnd15_dlob_dap1522b
+Alphanetworks wrgac01_dlob.hans_dir865
+Alphanetworks wrgn23_dlwbr_dir300b
+Alphanetworks wrgn28_dlob_dir412
+Alphanetworks wrgn39_dlob.hans_dir645_V1