Brandon Turner 05f0d09828 Merge branch staging/electro-release into master ... On August 15, shuckins-r7 merged the Metasploit 4.10.0 branch (staging/electro-release) into master. Rather than merging with history, he squashed all history into two commits (see 149c3ecc63 and 82760bf5b3). We want to preserve history (for things like git blame, git log, etc.). So on August 22, we reverted the commits above (see 19ba7772f3). This merge commit merges the staging/electro-release branch (62b81d6814) into master (48f0743d1b). It ensures that any changes committed to master since the original squashed merge are retained. As a side effect, you may see this merge commit in history/blame for the time period between August 15 and August 22.		2014-08-22 10:50:38 -05:00
..
aix	Revert "Various merge resolutions from master <- staging"	2014-08-22 10:17:44 -05:00
cisco/gather	Redo the boilerplate / splat	2013-10-15 13:51:57 -05:00
firefox	Kill newline (race @wvu-r7 on this)	2014-06-16 11:46:08 -05:00
linux	Merge branch staging/electro-release into master	2014-08-22 10:50:38 -05:00
multi	Revert "Various merge resolutions from master <- staging"	2014-08-22 10:17:44 -05:00
osx	Merge branch staging/electro-release into master	2014-08-22 10:50:38 -05:00
solaris/gather	Catch mis-formatted bracket comments.	2013-10-15 14:52:12 -05:00
windows	Revert "Various merge resolutions from master <- staging"	2014-08-22 10:17:44 -05:00