Merge https://github.com/rapid7/metasploit-framework into psexec-mixin2

Author: Royce Davis

.gitignore

@@ -10,7 +10,7 @@
 coverage
 data/meterpreter/ext_server_pivot.dll
 data/meterpreter/ext_server_pivot.x64.dll
-doc
+doc/
 external/source/meterpreter/java/bin
 external/source/meterpreter/java/build
 external/source/meterpreter/java/extensions
@@ -22,3 +22,4 @@ tags
 *.swp
 *.orig
 *.rej
+*~

.travis.yml

@@ -1,6 +1,6 @@
 language: ruby
 rvm:
-  - '1.8.7'
+  #- '1.8.7'
   - '1.9.3'
 
 notifications:

CONTRIBUTING.md

@@ -12,6 +12,11 @@ If your bug is new and you'd like to report it you will need to
 first](https://dev.metasploit.com/redmine/account/register). Don't
 worry, it's easy and fun and takes about 30 seconds.
 
+When you file a bug report, please inclue your **steps to reproduce**,
+full copy-pastes of Ruby stack traces, and any relevant details about
+your environment. Without repro steps, your bug will likely be closed.
+With repro steps, your bugs will likely be fixed.
+
 ## Contributing Metasploit Modules
 
 If you have an exploit that you'd like to contribute to the Metasploit

COPYING

@@ -1,4 +1,4 @@
-Copyright (C) 2006-2012, Rapid7 Inc.
+Copyright (C) 2006-2013, Rapid7 Inc.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -32,22 +32,6 @@ The Metasploit Framework is provided under the 3-clause BSD license above.
 
 The copyright on this package is held by Rapid7 LLC.
 
-This license does not apply to the following components:
- - The Bit-Struct library located under lib/bit-struct
- - The OpenSSL library embedded into the Meterpreter payload binaries and the
-   corresponding header files in the source tree
- - The Packet Sniffer SDK (MicroOLAP) library embedded into the Meterpreter
-   Sniffer extension. HD Moore has a single-seat developer license.
- - The modified TightVNC binaries and their associated source code.
- - The Byakugan plugin located under external/source/byakugan
- - The Metasm library located under lib/metasm
- - The PcapRub library located under external/pcaprub
- - The Rabal library located under lib/rabal
- - The PacketFu library located under lib/packetfu
- - The Ruby-Lorcon library located under external/ruby-lorcon
- - The SNMP library located under lib/snmp
- - The Zip library located under lib/zip
- - The SSHKey library located under lib/sshkey
-
-Details for the above packages can be found in the THIRD-PARTY file.
+This license does not apply to several components within the Metasploit
+Framework source tree.  For more details see the LICENSE file.