todo for 3.1

git-svn-id: file:///home/svn/framework3/trunk@4991 4d416f70-5f16-0410-b530-b9f4589650da

dev/merge.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
-export DEV=/msf3/
-export SBL=/projects/metasploit/framework3/tags/framework-3.0/
+export DEV=/home/mmiller/svn/framework3/trunk/
+export SBL=/home/mmiller/svn/framework3/tags/framework-3.0/
 export FIL=$1
 
 echo "[*] Gathering svn information..."

dev/rel3.1/TODO

@@ -0,0 +1,13 @@
+This file will hold the sweet things we plan on including in the 3.1 release:
+
+ - Remote Ruby (skape)
+   - Server-side Ruby provided as a Meterpreter extension
+	- Arbitrary Ruby code execution on remote machines
+ - Local Exploits (skape)
+   - While 3.0 "supports" local exploits, it really hasn't been flushed out
+	- Design support so that local exploits can be proxied to remote machines
+	  using dN/meterp
+ - Local Payloads (skape)
+   - Needed to nicely support local exploits
+	- Framework should classify local and remote payloads so that they are
+	  hidden from exploits that they aren't applicable to