Burer/kolibrios
1
0
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Activity
3,868 Commits 3 Branches 8 Tags 499 MiB
49fb1442fa
Commit Graph

1654 Commits

Author SHA1 Message Date
Sergey Semyonov (Serge)
38f0b2a169 acpi: update 
git-svn-id: svn://kolibrios.org@3725 a494cfbc-eb01-0410-851d-a64ba20cac60
 2013-06-28 08:02:49 +00:00
Marat Zakiyanov (Mario79)
93e7aee516 1) DMA LBA48 read and write for HDD 
2) Some optimization of code

git-svn-id: svn://kolibrios.org@3712 a494cfbc-eb01-0410-851d-a64ba20cac60
 2013-06-27 06:11:10 +00:00
CleverMouse
65d0cef44b style fixes, no binary changes (style checker was sick for some time) 
git-svn-id: svn://kolibrios.org@3711 a494cfbc-eb01-0410-851d-a64ba20cac60
 2013-06-26 23:35:43 +00:00
CleverMouse
296994e3bb full-fledged USB HID driver 
git-svn-id: svn://kolibrios.org@3709 a494cfbc-eb01-0410-851d-a64ba20cac60
 2013-06-26 22:08:56 +00:00
CleverMouse
b457ca5b59 make vidintel work on pineview videocards 
git-svn-id: svn://kolibrios.org@3708 a494cfbc-eb01-0410-851d-a64ba20cac60
 2013-06-26 17:49:53 +00:00
CleverMouse
21c6048a8f small fix 
git-svn-id: svn://kolibrios.org@3707 a494cfbc-eb01-0410-851d-a64ba20cac60
 2013-06-26 09:42:25 +00:00
Marat Zakiyanov (Mario79)
178ccd95f9 PIO LBA48 write for HDD 
git-svn-id: svn://kolibrios.org@3706 a494cfbc-eb01-0410-851d-a64ba20cac60
 2013-06-26 02:38:47 +00:00
hidnplayr
41339ef767 Allow SO_NONBLOCK to be set in socket type on socket open (similar to linux) 
git-svn-id: svn://kolibrios.org@3705 a494cfbc-eb01-0410-851d-a64ba20cac60
 2013-06-25 20:11:09 +00:00
hidnplayr
97c13d77de use blocking sockets by default. 
git-svn-id: svn://kolibrios.org@3704 a494cfbc-eb01-0410-851d-a64ba20cac60
 2013-06-25 20:02:56 +00:00
Marat Zakiyanov (Mario79)
d9b8117616 1) SATA IDE support for HDD and ATAPI 
2) PIO LBA48 read for HDD

git-svn-id: svn://kolibrios.org@3702 a494cfbc-eb01-0410-851d-a64ba20cac60
 2013-06-25 03:15:38 +00:00
CleverMouse
e787937c63 another small fix 
git-svn-id: svn://kolibrios.org@3700 a494cfbc-eb01-0410-851d-a64ba20cac60
 2013-06-24 15:22:56 +00:00
CleverMouse
77ca8a319a small fix 
git-svn-id: svn://kolibrios.org@3699 a494cfbc-eb01-0410-851d-a64ba20cac60
 2013-06-24 15:09:53 +00:00
hidnplayr
1ca5fecb5c Fixed alignment for data in network stack. Alqo, network queue uses a mutex now. 
git-svn-id: svn://kolibrios.org@3698 a494cfbc-eb01-0410-851d-a64ba20cac60
 2013-06-24 11:39:05 +00:00
hidnplayr
a5c3784aca Fixed that horrible TCP kernel crash. 
git-svn-id: svn://kolibrios.org@3697 a494cfbc-eb01-0410-851d-a64ba20cac60
 2013-06-24 10:47:25 +00:00
CleverMouse
c8f93d8d8f fix V86 IRQ redirecting when task switch is needed, it never worked before 
git-svn-id: svn://kolibrios.org@3696 a494cfbc-eb01-0410-851d-a64ba20cac60
 2013-06-24 07:49:56 +00:00
CleverMouse
703bc20999 make FDO for drivers safe: use changes from kernel in r1314 
git-svn-id: svn://kolibrios.org@3694 a494cfbc-eb01-0410-851d-a64ba20cac60
 2013-06-21 21:17:32 +00:00
Yogev Ezra
1a6a8ac7e2 Translate part of Russian comments in ext2 driver to English 
git-svn-id: svn://kolibrios.org@3691 a494cfbc-eb01-0410-851d-a64ba20cac60
 2013-06-21 00:56:10 +00:00
Marat Zakiyanov (Mario79)
13b10bc06f process_replace_file_name - uses the correct direction of search is now 
git-svn-id: svn://kolibrios.org@3689 a494cfbc-eb01-0410-851d-a64ba20cac60
 2013-06-20 00:33:36 +00:00
hidnplayr
a889feeb25 font.inc does not need to include 'lang.inc'. 
git-svn-id: svn://kolibrios.org@3684 a494cfbc-eb01-0410-851d-a64ba20cac60
 2013-06-19 08:31:20 +00:00
CleverMouse
1a7694e453 malloc/free do not change ebx now 
git-svn-id: svn://kolibrios.org@3681 a494cfbc-eb01-0410-851d-a64ba20cac60
 2013-06-18 10:33:19 +00:00
Marat Zakiyanov (Mario79)
7ba632508c Just a quick correction of the estimated potential problem with incorrect data changes during operation. In the future, I will replace the CLI on the mutex. 
git-svn-id: svn://kolibrios.org@3678 a494cfbc-eb01-0410-851d-a64ba20cac60
 2013-06-18 00:00:46 +00:00
hidnplayr
f828457410 SOCKET_connect can now block if wanted. 
git-svn-id: svn://kolibrios.org@3674 a494cfbc-eb01-0410-851d-a64ba20cac60
 2013-06-17 18:17:17 +00:00
hidnplayr
3e004fd364 Socket functions now return error code in ebx (bugfix) 
git-svn-id: svn://kolibrios.org@3673 a494cfbc-eb01-0410-851d-a64ba20cac60
 2013-06-17 13:59:20 +00:00
Marat Zakiyanov (Mario79)
799f7cdc6b Adding f.30.3 to mount the additional system directory (this is used by SEARCHAP). 
git-svn-id: svn://kolibrios.org@3663 a494cfbc-eb01-0410-851d-a64ba20cac60
 2013-06-15 21:17:06 +00:00
hidnplayr
db0d887216 Return 0 in ebx when there is no error 
git-svn-id: svn://kolibrios.org@3659 a494cfbc-eb01-0410-851d-a64ba20cac60
 2013-06-14 20:26:05 +00:00
hidnplayr
0192ef785b some socket functions now return error codes in ebx. 
git-svn-id: svn://kolibrios.org@3658 a494cfbc-eb01-0410-851d-a64ba20cac60
 2013-06-14 20:14:35 +00:00
CleverMouse
6447636270 impruv inglish 
git-svn-id: svn://kolibrios.org@3657 a494cfbc-eb01-0410-851d-a64ba20cac60
 2013-06-13 20:59:35 +00:00
CleverMouse
29efe4b59d make things more compliant 
git-svn-id: svn://kolibrios.org@3656 a494cfbc-eb01-0410-851d-a64ba20cac60
 2013-06-13 19:34:31 +00:00
CleverMouse
3d96d33ab7 simplify source, binary is not affected 
git-svn-id: svn://kolibrios.org@3653 a494cfbc-eb01-0410-851d-a64ba20cac60
 2013-06-13 10:46:56 +00:00
hidnplayr
52556729d6 Bugixes and improvements for closing TCP sockets. 
git-svn-id: svn://kolibrios.org@3652 a494cfbc-eb01-0410-851d-a64ba20cac60
 2013-06-13 08:22:37 +00:00
hidnplayr
910527aadc Fix for previous revision 
git-svn-id: svn://kolibrios.org@3648 a494cfbc-eb01-0410-851d-a64ba20cac60
 2013-06-12 10:53:22 +00:00
hidnplayr
3e584a778f Implemented global socket mutex. 
git-svn-id: svn://kolibrios.org@3647 a494cfbc-eb01-0410-851d-a64ba20cac60
 2013-06-12 10:21:41 +00:00
hidnplayr
97a976fc9a SOCKET_close, free TCP socket after closing connection. 
git-svn-id: svn://kolibrios.org@3646 a494cfbc-eb01-0410-851d-a64ba20cac60
 2013-06-12 09:06:59 +00:00
hidnplayr
819a12b8d2 Correct stats for TCP. 
git-svn-id: svn://kolibrios.org@3644 a494cfbc-eb01-0410-851d-a64ba20cac60
 2013-06-11 11:11:26 +00:00
hidnplayr
2b3ee8e109 Correct stats for UDP and ICMP. 
git-svn-id: svn://kolibrios.org@3643 a494cfbc-eb01-0410-851d-a64ba20cac60
 2013-06-11 10:46:29 +00:00
hidnplayr
2d3f4f397a Eth_input: allow frames smaller then 60 bytes. 
git-svn-id: svn://kolibrios.org@3642 a494cfbc-eb01-0410-851d-a64ba20cac60
 2013-06-11 06:41:02 +00:00
hidnplayr
663c6adac5 More ARP bugfixes 
git-svn-id: svn://kolibrios.org@3640 a494cfbc-eb01-0410-851d-a64ba20cac60
 2013-06-10 22:26:26 +00:00
hidnplayr
9246337d85 bugfixes in ARP and IPv4 code 
git-svn-id: svn://kolibrios.org@3638 a494cfbc-eb01-0410-851d-a64ba20cac60
 2013-06-10 20:19:12 +00:00
hidnplayr
20ce7bf7bd bugfix in SOCKET_bind 
git-svn-id: svn://kolibrios.org@3637 a494cfbc-eb01-0410-851d-a64ba20cac60
 2013-06-10 18:56:49 +00:00
CleverMouse
afab73e955 fix sysfn 70.4 with new size = current size 
git-svn-id: svn://kolibrios.org@3631 a494cfbc-eb01-0410-851d-a64ba20cac60
 2013-06-10 11:00:38 +00:00
Sergey Semyonov (Serge)
c5b8b35a47 acpi: a hopeless attempt to optimize the kernel memory 
git-svn-id: svn://kolibrios.org@3629 a494cfbc-eb01-0410-851d-a64ba20cac60
 2013-06-09 07:32:33 +00:00
Sergey Semyonov (Serge)
f272bbb588 kernel: reduce DRIVE_DATA array. Now kernel can handle only 64 /hd and /cd partitions 
git-svn-id: svn://kolibrios.org@3627 a494cfbc-eb01-0410-851d-a64ba20cac60
 2013-06-08 13:08:51 +00:00
Sergey Semyonov (Serge)
61f55267ef acpi:update 
git-svn-id: svn://kolibrios.org@3626 a494cfbc-eb01-0410-851d-a64ba20cac60
 2013-06-08 13:00:38 +00:00
CleverMouse
bf4022be57 be more fair 
git-svn-id: svn://kolibrios.org@3617 a494cfbc-eb01-0410-851d-a64ba20cac60
 2013-06-07 17:05:31 +00:00
CleverMouse
30b17fb697 allow high-priority threads to wakeup after any IRQ, not just timer 
git-svn-id: svn://kolibrios.org@3615 a494cfbc-eb01-0410-851d-a64ba20cac60
 2013-06-07 16:46:52 +00:00
shikhin
d4216492e1 Fixed sys_msg_board (fn 63) to not rely on cross_order and take arguments in original order. 
git-svn-id: svn://kolibrios.org@3614 a494cfbc-eb01-0410-851d-a64ba20cac60
 2013-06-07 14:12:54 +00:00
CleverMouse
37b9069351 preprocess fat chain for ramdisk before APIC initialization accesses it 
git-svn-id: svn://kolibrios.org@3613 a494cfbc-eb01-0410-851d-a64ba20cac60
 2013-06-07 08:46:54 +00:00
CleverMouse
5f85d6b8f5 fix r3536 
git-svn-id: svn://kolibrios.org@3611 a494cfbc-eb01-0410-851d-a64ba20cac60
 2013-06-06 10:50:52 +00:00
hidnplayr
c30fb05dcc Loopback device now works with entire 127.0.0.1/8 range, and also keeps some stats. 
git-svn-id: svn://kolibrios.org@3610 a494cfbc-eb01-0410-851d-a64ba20cac60
 2013-06-06 06:08:45 +00:00
hidnplayr
e395aa6070 bugfixes in ARP 
git-svn-id: svn://kolibrios.org@3609 a494cfbc-eb01-0410-851d-a64ba20cac60
 2013-06-06 05:19:15 +00:00
Sergey Semyonov (Serge)
a678afc6ad kernel: BytesPerScanLine removed, use _display.pitch instead 
git-svn-id: svn://kolibrios.org@3606 a494cfbc-eb01-0410-851d-a64ba20cac60
 2013-06-05 09:29:50 +00:00
hidnplayr
52893d0ce3 More timer bugfixes for TCP_output. 
git-svn-id: svn://kolibrios.org@3603 a494cfbc-eb01-0410-851d-a64ba20cac60
 2013-06-05 00:53:57 +00:00
hidnplayr
7ce53df3a1 Fixed bugs in new ARP code and TCP_output. 
git-svn-id: svn://kolibrios.org@3602 a494cfbc-eb01-0410-851d-a64ba20cac60
 2013-06-05 00:44:59 +00:00
hidnplayr
c0fe9dddf7 Improved loopback device, separate ARP tables for every interface, added arpstat functionality to netstat, preparing zeroconf to work on multiple interfaces, improved API (fn 76, fn 74), fixed some bugs. 
git-svn-id: svn://kolibrios.org@3601 a494cfbc-eb01-0410-851d-a64ba20cac60
 2013-06-05 00:21:20 +00:00
hidnplayr
c2bc66096c Renamed some variables and constants in network code, removed NET_set_default function, improved TCP timers 
git-svn-id: svn://kolibrios.org@3600 a494cfbc-eb01-0410-851d-a64ba20cac60
 2013-06-04 14:12:37 +00:00
CleverMouse
1267799afd do not use macro in sec_loader 
git-svn-id: svn://kolibrios.org@3599 a494cfbc-eb01-0410-851d-a64ba20cac60
 2013-06-04 11:16:20 +00:00
CleverMouse
a77e7ee15d make macro for push imm/pop dst 
git-svn-id: svn://kolibrios.org@3598 a494cfbc-eb01-0410-851d-a64ba20cac60
 2013-06-04 11:14:37 +00:00
Sergey Semyonov (Serge)
e80ec77b74 kernel: epic win. return to new cheat delay_hs 
git-svn-id: svn://kolibrios.org@3597 a494cfbc-eb01-0410-851d-a64ba20cac60
 2013-06-04 08:04:42 +00:00
Sergey Semyonov (Serge)
a830f8e6f3 kernel: epic fail. revert to old delay_hs code 
git-svn-id: svn://kolibrios.org@3596 a494cfbc-eb01-0410-851d-a64ba20cac60
 2013-06-03 20:16:51 +00:00
Sergey Semyonov (Serge)
315305ed2a Kernel: cheap and cheat delay_hs 
git-svn-id: svn://kolibrios.org@3595 a494cfbc-eb01-0410-851d-a64ba20cac60
 2013-06-03 19:47:50 +00:00
Sergey Semyonov (Serge)
ddb6fa98f4 kernel: quick fix for 3588 
git-svn-id: svn://kolibrios.org@3592 a494cfbc-eb01-0410-851d-a64ba20cac60
 2013-06-03 10:50:25 +00:00
Sergey Semyonov (Serge)
5ad3d16abe kernel: enable these ugly 24bpp videomodes again 
git-svn-id: svn://kolibrios.org@3591 a494cfbc-eb01-0410-851d-a64ba20cac60
 2013-06-03 10:35:59 +00:00
Sergey Semyonov (Serge)
8dd796543b acpi:update 
git-svn-id: svn://kolibrios.org@3589 a494cfbc-eb01-0410-851d-a64ba20cac60
 2013-06-02 10:40:22 +00:00
Sergey Semyonov (Serge)
996be4829b kernel: minor optimizations 
git-svn-id: svn://kolibrios.org@3588 a494cfbc-eb01-0410-851d-a64ba20cac60
 2013-06-02 09:36:14 +00:00
CleverMouse
01573335f1 and another one 
git-svn-id: svn://kolibrios.org@3579 a494cfbc-eb01-0410-851d-a64ba20cac60
 2013-05-31 17:53:53 +00:00
CleverMouse
fd419b402d make comment correct, resolve #64 
git-svn-id: svn://kolibrios.org@3578 a494cfbc-eb01-0410-851d-a64ba20cac60
 2013-05-31 17:51:17 +00:00
CleverMouse
f5abfdf5cc update documentation 
git-svn-id: svn://kolibrios.org@3577 a494cfbc-eb01-0410-851d-a64ba20cac60
 2013-05-30 14:00:40 +00:00
Sergey Semyonov (Serge)
70b7b47b34 kernel: fix for 3558 
git-svn-id: svn://kolibrios.org@3576 a494cfbc-eb01-0410-851d-a64ba20cac60
 2013-05-30 05:24:54 +00:00
Artem Jerdev (art_zh)
f138c2f662 Fusion frequencies detection 
git-svn-id: svn://kolibrios.org@3573 a494cfbc-eb01-0410-851d-a64ba20cac60
 2013-05-29 23:16:18 +00:00
hidnplayr
49266cf1ea Updated socket API documentation 
git-svn-id: svn://kolibrios.org@3571 a494cfbc-eb01-0410-851d-a64ba20cac60
 2013-05-29 13:47:55 +00:00
CleverMouse
3fc8b505e2 remove old attempts to write something USB-related, they are not actual anymore 
git-svn-id: svn://kolibrios.org@3568 a494cfbc-eb01-0410-851d-a64ba20cac60
 2013-05-29 12:48:49 +00:00
CleverMouse
c4636d1b86 remove hopelessly obsolete branch 
git-svn-id: svn://kolibrios.org@3567 a494cfbc-eb01-0410-851d-a64ba20cac60
 2013-05-29 12:45:44 +00:00
hidnplayr
8e107a1443 Socket_receive: return -1 when socket is closed. 
git-svn-id: svn://kolibrios.org@3565 a494cfbc-eb01-0410-851d-a64ba20cac60
 2013-05-29 11:46:06 +00:00
Sergey Semyonov (Serge)
f08dd2c7ab Kernel: remove ENABLE_TASKSWITCH PS2_CHUNK stack_data_start eth_data_start eth_data_start stack_data_end resendQ 
git-svn-id: svn://kolibrios.org@3560 a494cfbc-eb01-0410-851d-a64ba20cac60
 2013-05-28 19:56:59 +00:00
hidnplayr
0c73d15f63 Delete old net branch 
git-svn-id: svn://kolibrios.org@3559 a494cfbc-eb01-0410-851d-a64ba20cac60
 2013-05-28 19:53:40 +00:00
Sergey Semyonov (Serge)
d81e718e9b Kernel: remove useless MOUSE_DOWN MOUSE_BACKGROUND DONT_DRAW_MOUSE. 
git-svn-id: svn://kolibrios.org@3558 a494cfbc-eb01-0410-851d-a64ba20cac60
 2013-05-28 19:40:50 +00:00
hidnplayr
e93a49b442 Disabled network debug output by default. 
git-svn-id: svn://kolibrios.org@3556 a494cfbc-eb01-0410-851d-a64ba20cac60
 2013-05-28 19:19:23 +00:00
Sergey Semyonov (Serge)
3adc7b1d8e acpi:update 
git-svn-id: svn://kolibrios.org@3555 a494cfbc-eb01-0410-851d-a64ba20cac60
 2013-05-28 19:09:31 +00:00
hidnplayr
e4cf34c0de Merge new network stack with trunk 
git-svn-id: svn://kolibrios.org@3545 a494cfbc-eb01-0410-851d-a64ba20cac60
 2013-05-28 17:34:26 +00:00
CleverMouse
43f6a7d07a restore sec_loader after r3539 
git-svn-id: svn://kolibrios.org@3544 a494cfbc-eb01-0410-851d-a64ba20cac60
 2013-05-28 17:12:19 +00:00
CleverMouse
efb80df08b never relink mouse handler 
git-svn-id: svn://kolibrios.org@3543 a494cfbc-eb01-0410-851d-a64ba20cac60
 2013-05-28 16:29:26 +00:00
CleverMouse
b1b43099ea add forgotten include 
git-svn-id: svn://kolibrios.org@3540 a494cfbc-eb01-0410-851d-a64ba20cac60
 2013-05-27 22:19:11 +00:00
CleverMouse
32b4fcb9ab recode all kernel sources to UTF-8; binary still uses single-byte encoding and isn't changed at all 
git-svn-id: svn://kolibrios.org@3539 a494cfbc-eb01-0410-851d-a64ba20cac60
 2013-05-27 22:16:00 +00:00
CleverMouse
0a61fc62ad remove sec_loader/trunk/kolibri_ldm: uncompilable copy of some kernel files 
git-svn-id: svn://kolibrios.org@3538 a494cfbc-eb01-0410-851d-a64ba20cac60
 2013-05-27 21:37:45 +00:00
Sergey Semyonov (Serge)
8119f00711 kernel: remove ScreenBPP variable 
git-svn-id: svn://kolibrios.org@3537 a494cfbc-eb01-0410-851d-a64ba20cac60
 2013-05-27 19:09:54 +00:00
CleverMouse
f427028551 fix some GUI problems highlighted by r3534 
git-svn-id: svn://kolibrios.org@3536 a494cfbc-eb01-0410-851d-a64ba20cac60
 2013-05-27 16:49:46 +00:00
CleverMouse
bd6a09fefc fix direct I/O access broken in r3534 
git-svn-id: svn://kolibrios.org@3535 a494cfbc-eb01-0410-851d-a64ba20cac60
 2013-05-27 13:05:53 +00:00
CleverMouse
f059bc06d5 priorities in scheduler 
git-svn-id: svn://kolibrios.org@3534 a494cfbc-eb01-0410-851d-a64ba20cac60
 2013-05-27 09:02:35 +00:00
Artem Jerdev (art_zh)
55496cc735 LAPIC timer interrupt test 
git-svn-id: svn://kolibrios.org@3531 a494cfbc-eb01-0410-851d-a64ba20cac60
 2013-05-23 17:29:52 +00:00
Artem Jerdev (art_zh)
3aef84d056 minor corrections 
git-svn-id: svn://kolibrios.org@3526 a494cfbc-eb01-0410-851d-a64ba20cac60
 2013-05-21 20:28:08 +00:00
CleverMouse
df1bbc6819 fix disk-full handling when creating a folder in ramdisk 
git-svn-id: svn://kolibrios.org@3525 a494cfbc-eb01-0410-851d-a64ba20cac60
 2013-05-21 13:34:46 +00:00
CleverMouse
b7d54cce54 export USB API to drivers 
git-svn-id: svn://kolibrios.org@3524 a494cfbc-eb01-0410-851d-a64ba20cac60
 2013-05-20 08:45:18 +00:00
hidnplayr
75882efdc9 Removed code trap (shouldnt have been comitted in the first place). 
git-svn-id: svn://kolibrios.org@3523 a494cfbc-eb01-0410-851d-a64ba20cac60
 2013-05-18 10:55:03 +00:00
CleverMouse
4aaa9b7e36 that would be too verbose 
git-svn-id: svn://kolibrios.org@3522 a494cfbc-eb01-0410-851d-a64ba20cac60
 2013-05-18 00:17:04 +00:00
CleverMouse
c1284fc3b6 USB support 
git-svn-id: svn://kolibrios.org@3520 a494cfbc-eb01-0410-851d-a64ba20cac60
 2013-05-17 23:53:28 +00:00
Artem Jerdev (art_zh)
bcdfe175d7 APU mmio area: hack-ready 
git-svn-id: svn://kolibrios.org@3519 a494cfbc-eb01-0410-851d-a64ba20cac60
 2013-05-17 17:17:20 +00:00
hidnplayr
a0f9d2e236 Fixed Network2 event (low level network event) 
git-svn-id: svn://kolibrios.org@3518 a494cfbc-eb01-0410-851d-a64ba20cac60
 2013-05-17 13:33:04 +00:00
CleverMouse
b7bd43fe91 do not flood logs with unrecognized network packets 
git-svn-id: svn://kolibrios.org@3517 a494cfbc-eb01-0410-851d-a64ba20cac60
 2013-05-17 13:32:52 +00:00
hidnplayr
7a6a47ea05 Renamed zeroconfig.ini to network.ini and moved to /sys/ 
git-svn-id: svn://kolibrios.org@3516 a494cfbc-eb01-0410-851d-a64ba20cac60
 2013-05-17 12:22:14 +00:00
hidnplayr
6bf8356208 Renamed IPv4_dest_to_dev to IPv4_route 
git-svn-id: svn://kolibrios.org@3515 a494cfbc-eb01-0410-851d-a64ba20cac60
 2013-05-17 11:33:49 +00:00