Unconflicting ruby_string method

Looks like the conflict was created by the msftidy fixes that happened
over on the master branch. No big deal after all.
This module exploits an authentication bypass vulnerability in SAP NetWeaver CTC service
SAP /sap/bw/xml/soap/xmla XMLA service (XML DOCTYPE) SMB relay
RZL_READ_DIR_LOCAL (directory listing and SMB relay)
PFL_CHECK_OS_FILE_EXISTENCE (file existence and SMB relay)
Merge branch 'master' of github.com:shellster/metasploit-framework into shellster-master
EPS_DELETE_FILE (File deletion and SMB Relay)
Merge branch 'master' of git://github.com/rapid7/metasploit-framework
Add dlink pass for #1648
This module exploits an authentication bypass vulnerability in SAP NetWeaver CTC service
This module exploits an authentication bypass vulnerability in SAP NetWeaver CTC service
remove sap_soap_rfc_eps_delete_file_smb_relay.rb
vprint_status mod
vprint_status mod
vprint_status mod
vprint_status mod
EPS_GET_DIRECTORY_LISTING (List Directory abd SMB Relay)
SAP /sap/bc/soap/rfc SOAP Service SXPG_COMMAND_EXEC Function Command Injection
Rex::Text.rand_text_alphanumeric for file name
SAP /sap/bc/soap/rfc SOAP Service SXPG_CALL_SYSTEM Function Command Execution