infosecn1nja
/
metasploit-framework
mirror of https://github.com/infosecn1nja/metasploit-framework.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
12,195 Commits
7 Branches
556 Tags
421 MiB
Commit Graph

1838 Commits (4f05f4e03f19546b14204b7aa4a2d020b7450a40)

Author SHA1 Message Date
Tod Beardsley 50fa10679b First draft of a TFTP client. 
Could use some actual error checking and also needs to expose
more options.
 2011-12-16 18:41:55 -06:00
chao ec1dd8154e When duplicating a DLL, duplicate everything underneath it to remain threadsafe. I wrote this patch months and months ago. The way I am deep copying produced much groaning in #metasploit when I put it in for code review. It was ultimately declared the lesser of two evils. If you have chat logs from months ago you may be able to find the discussion 2011-12-15 22:05:02 -05:00
HD Moore 2c538fe9c0 Rework RangeWalker and some of the socket API to fix bugs and generally 
handle ranges the right way
 2011-12-10 20:10:10 -06:00
HD Moore dee053cd71 Try multiple scopes for link-local addresses, if necessary. Fix a small 
typo
 2011-12-10 15:24:10 -06:00
HD Moore e46745b761 Add support for link-local scopes 2011-12-10 13:24:58 -06:00
HD Moore 1cc68d1ed5 Accept IPv6 addresses in getaddress() responses 2011-12-10 13:24:58 -06:00
HD Moore 49ff9f594a Properly enclose IPv6 addresses with brackets inside of the Host header 2011-12-10 13:24:58 -06:00
HD Moore 72f64583e2 Add IPv6 range support, permission tweak 2011-12-06 00:43:11 -06:00
HD Moore 4344a5f92a Fix up IPv6 resolution in DNS replies 2011-12-05 13:07:37 -06:00
HD Moore bcebdb1893 Improve IPv6 handling 2011-12-05 13:07:37 -06:00
HD Moore 27974c4c27 Merge branch 'master' of github.com:rapid7/metasploit-framework into fastlib 
Conflicts:
	modules/auxiliary/scanner/http/axis_login.rb
	modules/exploits/multi/http/axis2_deployer.rb
	modules/post/multi/gather/thunderbird_creds.rb
	modules/post/windows/gather/credentials/imvu.rb
	msfopcode
 2011-12-03 14:07:09 -06:00
Tod Beardsley 6b06df0d7d Merge pull request #38 from XeroHawk/alpha2_fix 
Ported over the Issue 3190 SVN changes for unicode_mixed, an old bug that was hiding out in Redmine.
 2011-12-02 12:51:47 -08:00
David Maloney 1db9177583 Revert "Merge pull request #22 from scriptjunkie/multithread" 
This reverts commit 4f76f3bbb8, reversing
changes made to e72dad4e81.
 2011-12-02 13:35:43 -05:00
HD Moore 4f76f3bbb8 Merge pull request #22 from scriptjunkie/multithread 
RPC multithreading
 2011-12-01 23:43:32 -08:00
HD Moore e72dad4e81 Rescue the load error so rex will work outside of Metasploit. Fixes 2011-12-02 00:28:31 -06:00
Xero Hawk 2ac8cbaf66 Ported over the Issue 3190 SVN changes 2011-11-30 14:37:10 -05:00
Joshua J. Drake e9c3e8ee50 Fix SMB_COM_NT_TRANSACT structure definition per specification. For more information see http://j.mp/t5zzku 2011-11-27 19:27:01 -06:00
HD Moore f82c7e9bb4 Fixup requires to use sane paths 2011-11-21 14:37:26 -06:00
James Lee 8f56dc1504 get rid of a bunch more spaces at EOL 2011-11-20 11:46:35 +11:00
James Lee 70b463b257 msftidy run 2011-11-20 11:39:27 +11:00
James Lee 60c3c44800 remove spaces at EOL 2011-11-20 11:30:15 +11:00
scriptjunkie c4eb32d2ff Add an optional multithreading to stream server, and enable multithreading (one thread per client) to the RPC server. 2011-11-17 08:07:34 -08:00
Tod Beardsley 6715248047 Minor comment fixes 
Removing patch comment
 2011-11-17 08:42:30 -06:00
Dillon 67c07165c6 Update lib/rex/post/meterpreter/ui/console/command_dispatcher/stdapi/sys.rb 2011-11-17 08:26:57 -06:00
Dillon 66621632f0 added linux shell functionality to meterpreter's shell command. 2011-11-17 08:26:57 -06:00
HD Moore 825c9f776c Fixes #5980 by correcting the address match for IPv6. Clean up regex mapping in general 2011-11-16 14:35:23 -06:00
James Lee 91e7e39fd9 Add definition for DeleteService 2011-11-13 21:04:35 -07:00
Tod Beardsley 40614a3cf4 Merge branch 'iss5454' 2011-11-11 11:26:05 -06:00
Tom Samstag 7b7413d85e Bash format for msfencode/msfvenom 
This patch adds a Bash output format for msfencode and msfvenom. This is especially useful for local exploitation with shellcode in an environment variable.
Example output:

$ echo 'this is a test' | ./msfvenom -f bash
[-] Using X86 architecture and Windows platform for stdin payload to change use -a and --platform
export buf=\
$'\x74\x68\x69\x73\x20\x69\x73\x20\x61\x20\x74\x65\x73\x74'\
$'\x0a'

It adds unit tests for the new format and also fixes a unit test that was broken (assert_equal 'AAAAAAAAA', Rex::Text.pattern_create(9,['A'])) due to a bug in the shortcut in pattern_create.
 2011-11-11 00:13:17 -08:00
HD Moore 30a86c9378 Merge patch to fix #5271 2011-11-10 20:01:50 -06:00
Wei Chen b689796678 msf*scan is busted with -i because of "uninitialized constant Rex::Socket". This addresses that issue. 
git-svn-id: file:///home/svn/framework3/trunk@14117 4d416f70-5f16-0410-b530-b9f4589650da
 2011-10-29 18:54:24 +00:00
Tod Beardsley fed2e9a611 Fixes #2052. The supplied patch wanted to do it in the to_s, but it seems to make more sense to do this kind of thing in the sort_rows() method. 
Thanks for the patch, though. Note, it's slightly easier to locate which file you're diffing if you diff from the top of /trunk.



git-svn-id: file:///home/svn/framework3/trunk@14051 4d416f70-5f16-0410-b530-b9f4589650da
 2011-10-24 20:41:26 +00:00
James Lee 437e2e79be whitespace 
git-svn-id: file:///home/svn/framework3/trunk@14043 4d416f70-5f16-0410-b530-b9f4589650da
 2011-10-24 04:54:03 +00:00
James Lee 70bf92edae whitespace 
git-svn-id: file:///home/svn/framework3/trunk@14042 4d416f70-5f16-0410-b530-b9f4589650da
 2011-10-24 04:52:22 +00:00
HD Moore 5fec13a389 Propogate the timeout in send_recv() down to the TCP connect call as well 
git-svn-id: file:///home/svn/framework3/trunk@14021 4d416f70-5f16-0410-b530-b9f4589650da
 2011-10-21 15:41:37 +00:00
HD Moore 3cfa3c25d3 Treat all input as strings, avoids some sloppy caller code that wasn't as strict before 
git-svn-id: file:///home/svn/framework3/trunk@13995 4d416f70-5f16-0410-b530-b9f4589650da
 2011-10-18 19:16:48 +00:00
HD Moore 62740172e4 Officially remove support for the buggy/non-functional MySQL backend 
git-svn-id: file:///home/svn/framework3/trunk@13948 4d416f70-5f16-0410-b530-b9f4589650da
 2011-10-16 09:42:04 +00:00
Tod Beardsley c532cfd2ef Fixes a problem where vulns were sometimes given the reference of the one before it. 
git-svn-id: file:///home/svn/framework3/trunk@13947 4d416f70-5f16-0410-b530-b9f4589650da
 2011-10-16 04:46:16 +00:00
James Lee 643f2ab242 better fix for gsub() on non-String values in the table. Fixes cachedump brokenness 
git-svn-id: file:///home/svn/framework3/trunk@13944 4d416f70-5f16-0410-b530-b9f4589650da
 2011-10-16 00:23:29 +00:00
James Lee 8295bb0a4e fix a nil.gsub() bug 
git-svn-id: file:///home/svn/framework3/trunk@13943 4d416f70-5f16-0410-b530-b9f4589650da
 2011-10-16 00:18:30 +00:00
Tod Beardsley 52767b3104 Fixes #5204. Adding Windows Console2 color support from mihi. Thanks! 
git-svn-id: file:///home/svn/framework3/trunk@13913 4d416f70-5f16-0410-b530-b9f4589650da
 2011-10-13 17:35:31 +00:00
Carlos Perez 4d4b07db40 Winsock2 getaddrinfo definition for Railgun 
git-svn-id: file:///home/svn/framework3/trunk@13894 4d416f70-5f16-0410-b530-b9f4589650da
 2011-10-12 23:14:10 +00:00
Chao Mu 09423d89ef Adding support for wlanapi in prep for thelightcosine's coming modules. Note, this will *not* break railgun on systems that don't support wlanapi. 
git-svn-id: file:///home/svn/framework3/trunk@13888 4d416f70-5f16-0410-b530-b9f4589650da
 2011-10-12 02:58:45 +00:00
Tod Beardsley a75371c282 See #5660. Well that broke other things. Rats. 
git-svn-id: file:///home/svn/framework3/trunk@13861 4d416f70-5f16-0410-b530-b9f4589650da
 2011-10-10 21:20:45 +00:00
Tod Beardsley e9e4dc5d02 Fixes #5660 for real. Apparently I cannot tell the difference between 0 and 1. I would be a terrible robot. 0101100101. 
git-svn-id: file:///home/svn/framework3/trunk@13857 4d416f70-5f16-0410-b530-b9f4589650da
 2011-10-10 19:03:18 +00:00
Tod Beardsley 1f1cd87e87 Fixes #5660. update_prompt('') is now equivalent to update_prompt(nil), which avoids the prompt stacking problem when setting an empty prompt. 
git-svn-id: file:///home/svn/framework3/trunk@13855 4d416f70-5f16-0410-b530-b9f4589650da
 2011-10-10 18:42:44 +00:00
HD Moore 292aae8ab5 This small patch causes any input to RangeWalker that contains a host name to expand to all A records returned for that name. This allows RHOSTS to be set to a dns name that returns multiple addresses and for all addresses corresponding to the name to be tested. 
git-svn-id: file:///home/svn/framework3/trunk@13837 4d416f70-5f16-0410-b530-b9f4589650da
 2011-10-09 01:07:51 +00:00
Wei Chen 1649a6d47c Add function for CredEnumerateA 
git-svn-id: file:///home/svn/framework3/trunk@13833 4d416f70-5f16-0410-b530-b9f4589650da
 2011-10-07 21:01:35 +00:00
Tod Beardsley b21acdaaae Rex shouldn't die when trying to Rex::Text.base64_encode(nil). It should return an empty string. 
git-svn-id: file:///home/svn/framework3/trunk@13817 4d416f70-5f16-0410-b530-b9f4589650da
 2011-10-05 01:42:14 +00:00
James Lee b3e96add60 fix whitespace at eol 
git-svn-id: file:///home/svn/framework3/trunk@13795 4d416f70-5f16-0410-b530-b9f4589650da
 2011-09-26 17:42:07 +00:00
Matt Weeks de9e99bd3d Fix some TOCTOU confusion and database errors. 
git-svn-id: file:///home/svn/framework3/trunk@13779 4d416f70-5f16-0410-b530-b9f4589650da
 2011-09-23 15:12:19 +00:00
Joshua Drake 2481eac4be remove extraneous relative load path addition, bad bad bad 
git-svn-id: file:///home/svn/framework3/trunk@13761 4d416f70-5f16-0410-b530-b9f4589650da
 2011-09-19 23:01:26 +00:00
Tod Beardsley b72ca9dcc8 Fixes #5452. 
Fixes #5446 for real.
Breaks up the regex to more managable registers, ensures that nil is never returned.


git-svn-id: file:///home/svn/framework3/trunk@13729 4d416f70-5f16-0410-b530-b9f4589650da
 2011-09-14 16:41:30 +00:00
Tod Beardsley 0413dc25c5 Fixes #5446 by ensuring the method is always sane. 
git-svn-id: file:///home/svn/framework3/trunk@13723 4d416f70-5f16-0410-b530-b9f4589650da
 2011-09-12 19:59:29 +00:00
Matt Weeks acae5dcdc8 Killing puts. 
Die, puts, die!!



git-svn-id: file:///home/svn/framework3/trunk@13715 4d416f70-5f16-0410-b530-b9f4589650da
 2011-09-11 02:42:39 +00:00
Wei Chen 14f39a69a0 Show DllCharacteristics (see #5234) 
git-svn-id: file:///home/svn/framework3/trunk@13709 4d416f70-5f16-0410-b530-b9f4589650da
 2011-09-08 22:55:12 +00:00
Wei Chen e748b53a54 Modify the code for imported functions in order to display the addresses. See #5422. 
git-svn-id: file:///home/svn/framework3/trunk@13704 4d416f70-5f16-0410-b530-b9f4589650da
 2011-09-07 23:17:47 +00:00
Wei Chen 047b1b4ee2 RopCollect needs to use print_status too 
git-svn-id: file:///home/svn/framework3/trunk@13701 4d416f70-5f16-0410-b530-b9f4589650da
 2011-09-06 23:08:58 +00:00
David Rude 7e0424e976 fixes some bugs with imports of rop gadgets 
git-svn-id: file:///home/svn/framework3/trunk@13700 4d416f70-5f16-0410-b530-b9f4589650da
 2011-09-06 22:27:03 +00:00
David Rude 5e4a3f5beb Opps typo in the require 
git-svn-id: file:///home/svn/framework3/trunk@13678 4d416f70-5f16-0410-b530-b9f4589650da
 2011-09-01 10:21:15 +00:00
David Rude 525af4325d Add the jsobfu require 
git-svn-id: file:///home/svn/framework3/trunk@13677 4d416f70-5f16-0410-b530-b9f4589650da
 2011-09-01 09:11:23 +00:00
David Rude 1e37649a4d Add backwards compatability support for old obfuscation methods needed by older exploits 
git-svn-id: file:///home/svn/framework3/trunk@13674 4d416f70-5f16-0410-b530-b9f4589650da
 2011-09-01 08:58:18 +00:00
David Rude aa5ad30805 Alters heaplib so it no longer obfuscates using the old method 
git-svn-id: file:///home/svn/framework3/trunk@13665 4d416f70-5f16-0410-b530-b9f4589650da
 2011-08-30 22:08:51 +00:00
Wei Chen ee961b69ad Add support for virtualalloc (see #5262) 
git-svn-id: file:///home/svn/framework3/trunk@13659 4d416f70-5f16-0410-b530-b9f4589650da
 2011-08-30 06:52:56 +00:00
Matt Weeks 6853221762 Fixes #5313 by adding logging support to pivoted PXE attacks, and displaying results as the module runs. 
git-svn-id: file:///home/svn/framework3/trunk@13646 4d416f70-5f16-0410-b530-b9f4589650da
 2011-08-27 15:46:49 +00:00
Matt Weeks 23b4f4ed98 Address #5313 for locally-launched PXE attacks. 
git-svn-id: file:///home/svn/framework3/trunk@13639 4d416f70-5f16-0410-b530-b9f4589650da
 2011-08-25 22:48:33 +00:00
Matt Weeks 2b340439e0 Fixes #5312 - auto boot from disk on second PXE boot (after payload delivery). 
git-svn-id: file:///home/svn/framework3/trunk@13629 4d416f70-5f16-0410-b530-b9f4589650da
 2011-08-24 21:28:31 +00:00
James Lee 3c7f25ff78 help help 
git-svn-id: file:///home/svn/framework3/trunk@13579 4d416f70-5f16-0410-b530-b9f4589650da
 2011-08-18 20:29:49 +00:00
Matt Weeks 9e80c740b6 Also recognize PXE clients who do not set the PXE option in the DHCP request but do identify in client string. 
git-svn-id: file:///home/svn/framework3/trunk@13577 4d416f70-5f16-0410-b530-b9f4589650da
 2011-08-18 00:18:43 +00:00
James Lee f99429138e clean up some rdoc comments. odd that rdoc doesn't appear to pick up ApiConstants at all... 
git-svn-id: file:///home/svn/framework3/trunk@13576 4d416f70-5f16-0410-b530-b9f4589650da
 2011-08-17 23:00:28 +00:00
James Lee 0fc14a2164 whitespace 
git-svn-id: file:///home/svn/framework3/trunk@13572 4d416f70-5f16-0410-b530-b9f4589650da
 2011-08-16 21:16:25 +00:00
James Lee 79b7fb7c43 actually store the new Util object. how did this ever work before? fixes #5265 
git-svn-id: file:///home/svn/framework3/trunk@13571 4d416f70-5f16-0410-b530-b9f4589650da
 2011-08-16 18:01:21 +00:00
James Lee f16e593628 report udp protocol correctly, see #5260, r13569 
git-svn-id: file:///home/svn/framework3/trunk@13570 4d416f70-5f16-0410-b530-b9f4589650da
 2011-08-15 22:39:41 +00:00
James Lee 4779c039f0 protocol != proto. fixes #5260 
git-svn-id: file:///home/svn/framework3/trunk@13569 4d416f70-5f16-0410-b530-b9f4589650da
 2011-08-15 22:29:57 +00:00
Chao Mu c77dfcc48e fixes #5232 Add DLL definition for crypt32. I removed a custom add too 
git-svn-id: file:///home/svn/framework3/trunk@13560 4d416f70-5f16-0410-b530-b9f4589650da
 2011-08-14 21:08:55 +00:00
Matt Weeks 4a7714e1b1 Fix #5244 
git-svn-id: file:///home/svn/framework3/trunk@13551 4d416f70-5f16-0410-b530-b9f4589650da
 2011-08-12 20:26:03 +00:00
Joshua Drake 5966cf460e Fixes #5240: avoid crash when read fails 
git-svn-id: file:///home/svn/framework3/trunk@13550 4d416f70-5f16-0410-b530-b9f4589650da
 2011-08-12 19:30:56 +00:00
Jonathan Cran 15a9036dd9 add in the Buffer input class 
git-svn-id: file:///home/svn/framework3/trunk@13516 4d416f70-5f16-0410-b530-b9f4589650da
 2011-08-10 21:05:12 +00:00
Chao Mu 0bc44c4736 Expanding the range of mock dll/functions to allow for more thorough testing. Number of assertions when you run railgun tests are about to jump. 
git-svn-id: file:///home/svn/framework3/trunk@13506 4d416f70-5f16-0410-b530-b9f4589650da
 2011-08-10 03:36:39 +00:00
James Lee a5b30b1964 sometimes windows raises EADDRNOTAVAIL which gets mapped to AddressInUse when using addresses it doesn't like, e.g. .0 and .255; make AddressInUse a ConnectionError so scanners handle it properly. makes scanners work on windows when an address range includes one of these. they won't be scanned (since windows is dumb) but at least it won't error out. 
git-svn-id: file:///home/svn/framework3/trunk@13503 4d416f70-5f16-0410-b530-b9f4589650da
 2011-08-10 00:51:23 +00:00
Matt Weeks b2733c04db More PXE dust for extra magic! 
git-svn-id: file:///home/svn/framework3/trunk@13493 4d416f70-5f16-0410-b530-b9f4589650da
 2011-08-05 17:10:27 +00:00
HD Moore 842bfdebe8 Lets just leave this here (insurance against my laptop melting down between now and tomorrow morning). Nothing to see here, move along ;) 
git-svn-id: file:///home/svn/framework3/trunk@13483 4d416f70-5f16-0410-b530-b9f4589650da
 2011-08-03 22:58:55 +00:00
HD Moore d7e775b74c This speeds up shutdown for normal reverse_tcp meterpreters (avoids the penalization for http/https) 
git-svn-id: file:///home/svn/framework3/trunk@13470 4d416f70-5f16-0410-b530-b9f4589650da
 2011-08-02 01:33:17 +00:00
HD Moore 7fa5795115 Cleanup session files. Wait a little longer for the session to receive the shutdown command 
git-svn-id: file:///home/svn/framework3/trunk@13458 4d416f70-5f16-0410-b530-b9f4589650da
 2011-07-31 19:46:36 +00:00
James Lee f5862e87d0 guard against nil and false ranges 
git-svn-id: file:///home/svn/framework3/trunk@13446 4d416f70-5f16-0410-b530-b9f4589650da
 2011-07-31 15:48:29 +00:00
Tod Beardsley 7667e5aa74 More of the same. 
git-svn-id: file:///home/svn/framework3/trunk@13439 4d416f70-5f16-0410-b530-b9f4589650da
 2011-07-30 23:50:04 +00:00
Tod Beardsley 58f7618b78 Fixes #5144. Repro's with nexpose-raw.xml in sample data -- before the fix, DNS on port 53 would be marked as "Postfix" which is the same as the service prior, 25/tcp. After the fix, it is appropriately blank. (Same with 80/tcp and 443/tcp both being Apache -- technically probably correct but the service fingerprint isn't there for 443 in the import). 
Checking other service importers for the same kind of problem, but it looks unique to nexpose-raw.



git-svn-id: file:///home/svn/framework3/trunk@13438 4d416f70-5f16-0410-b530-b9f4589650da
 2011-07-30 23:35:13 +00:00
HD Moore 7f758e42e8 Fix up SSL behavior (correctly, this time). Update the msfrpc tools to support the new MessagePack code, fix various defaults in the plugin. Fixes #5116 
git-svn-id: file:///home/svn/framework3/trunk@13416 4d416f70-5f16-0410-b530-b9f4589650da
 2011-07-29 23:58:05 +00:00
HD Moore 07df5f051f Woops. Get the right variable name 
git-svn-id: file:///home/svn/framework3/trunk@13412 4d416f70-5f16-0410-b530-b9f4589650da
 2011-07-29 19:26:43 +00:00
HD Moore f57799943c Rework this patch to only enable non-blocking openssl on Windows, as this has also reproduced on BT5 with 1.9.2 
git-svn-id: file:///home/svn/framework3/trunk@13411 4d416f70-5f16-0410-b530-b9f4589650da
 2011-07-29 19:10:20 +00:00
HD Moore ace9ca86a8 This commit abstracts the non-blocking SSL check so that it verifies existence of the non-blocking API and skips Mac OS X. This should fix some of the issues with meterpreter on MacOS X with Ruby 1.9.2 
git-svn-id: file:///home/svn/framework3/trunk@13404 4d416f70-5f16-0410-b530-b9f4589650da
 2011-07-29 03:34:15 +00:00
James Lee d50577066f remove some silliness of registering UserAgent as an option since it's already an advanced option for HttpClient, make the default obvious 
git-svn-id: file:///home/svn/framework3/trunk@13394 4d416f70-5f16-0410-b530-b9f4589650da
 2011-07-28 22:57:47 +00:00
HD Moore 9f8cbc4145 First pass at an import, still missing a few items to call this done 
git-svn-id: file:///home/svn/framework3/trunk@13390 4d416f70-5f16-0410-b530-b9f4589650da
 2011-07-28 21:17:30 +00:00
HD Moore c7077f2551 Fix up the stop call 
git-svn-id: file:///home/svn/framework3/trunk@13382 4d416f70-5f16-0410-b530-b9f4589650da
 2011-07-27 20:50:11 +00:00
James Lee aa2c025ce1 add a flush option to portfwd. thanks ipax for the patch! 
git-svn-id: file:///home/svn/framework3/trunk@13359 4d416f70-5f16-0410-b530-b9f4589650da
 2011-07-27 04:59:06 +00:00
Joshua Drake f1473c4cb3 Fixes #5062 - Use .length instead of .count (1.8 compat) 
git-svn-id: file:///home/svn/framework3/trunk@13352 4d416f70-5f16-0410-b530-b9f4589650da
 2011-07-26 23:36:30 +00:00
James Lee fa4dbf6783 move the client accessor back to the top so it's available when needed, use the session-specific separator, fixes #4892 again 
git-svn-id: file:///home/svn/framework3/trunk@13350 4d416f70-5f16-0410-b530-b9f4589650da
 2011-07-26 22:37:41 +00:00
James Lee 2212afcf31 un-remove an important include... 
git-svn-id: file:///home/svn/framework3/trunk@13348 4d416f70-5f16-0410-b530-b9f4589650da
 2011-07-26 20:58:23 +00:00
James Lee 0f95070f3f add a request type for grabbing the host's directory separator, fixes #4892 
git-svn-id: file:///home/svn/framework3/trunk@13346 4d416f70-5f16-0410-b530-b9f4589650da
 2011-07-26 20:51:33 +00:00
David Rude 25bdbe6568 More prompt bug fixes, back and use commands should work properly now 
git-svn-id: file:///home/svn/framework3/trunk@13326 4d416f70-5f16-0410-b530-b9f4589650da
 2011-07-24 18:41:23 +00:00