Commit Graph

2492 Commits

Author SHA1 Message Date
raulmateos dbf92c1872 2010-05-20 Raul Mateos <raulofpandora@gmail.com>
* operation/users/user_edit.php: Updated year. Use better table in group
	list.
	* godmode/snmp_console/snmp_alert.php: Updated year. Removed old header.
	Added code to show different header depending on GET parameter.

git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2769 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-05-20 12:07:19 +00:00
mdtrooper 38fa5603a3 2010-05-20 Miguel de Dios <miguel.dedios@artica.es>
* DEBIAN/make_deb_package.sh: fixed the permissions to DEBIAN temp package. 



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2768 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-05-20 11:00:46 +00:00
mdtrooper f93bcc2c95 Lost files.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2767 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-05-20 10:59:41 +00:00
mdtrooper acfe6cc29c 2010-05-20 Miguel de Dios <miguel.dedios@artica.es>
* DEBIAN/make_deb_package.sh: fixed the permissions to DEBIAN temp package. 



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2766 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-05-20 10:59:20 +00:00
mdtrooper 3cde7d94de 2010-05-20 Miguel de Dios <miguel.dedios@artica.es>
* DEBIAN/make_deb_package.sh: fixed the permissions to DEBIAN temp package. 
	


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2765 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-05-20 10:58:40 +00:00
mdtrooper 2c98965ff6 2010-05-20 Miguel de Dios <miguel.dedios@artica.es>
* DEBIAN/make_deb_package.sh: fixed the permissions to DEBIAN temp package. 
	


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2764 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-05-20 10:57:03 +00:00
slerena 0dac438a7f 2010-05-20 Sancho Lerena <slerena@artica.es>
* util/plugins/snmp_process.pl: Some small modifications and fixes for 
	RAM output, also improved help.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2763 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-05-20 07:46:09 +00:00
mdtrooper 7a8734b877 Last changes for Ramon.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2762 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-05-19 21:21:43 +00:00
mdtrooper c8f3bb963f 2010-05-19 Miguel de Dios <miguel.dedios@artica.es>
* DEBIAN/control: added the depends libio-socket-multicast-perl.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2761 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-05-19 19:02:00 +00:00
mdtrooper ca537d5983 2010-05-19 Miguel de Dios <miguel.dedios@artica.es>
* DEBIAN/make_deb_package.sh: cleaned the source code.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2760 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-05-19 17:58:52 +00:00
mdtrooper c240763598 2010-05-19 Miguel de Dios <miguel.dedios@artica.es>
* DEBIAN/conffiles: added the conffiles to tell to package maker that its
	the conf file.
	
	* DEBIAN/make_deb_package.sh: changed the script to try to be similar to
	spec RPM (set the location of perl libs). 



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2759 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-05-19 17:56:49 +00:00
mdtrooper 1cdf9f9134 2010-05-19 Miguel de Dios <miguel.dedios@artica.es>
* DEBIAN, DEBIAN/control, DEBIAN/conffiles, DEBIAN/make_deb_package.sh,
	DEBIAN/md5sums: added the scripts and conf files for create package.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2758 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-05-19 17:12:25 +00:00
mdtrooper 7a67a35f29 2010-05-19 Miguel de Dios <miguel.dedios@artica.es>
* DEBIAN/make_deb_package.sh: added cpan parameter for to make module
	packages or not.
	
	* pandora_server.spec: force the location of lib.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2757 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-05-19 17:09:15 +00:00
zarzuelo 53a9535975 2010-05-19 Sergio Martin <sergio.martin@artica.es>
* util/plugin/snmp_process.pl: Added the SNMP Server 
	Plugin to Server.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2756 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-05-19 17:03:16 +00:00
ramonn d1fad40da3 2010-05-19 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/SNMPServer.pm, lib/PandoraFMS/Config.pm,
          lib/PandoraFMS/Server.pm, lib/PandoraFMS/NetworkServer.pm,
          lib/PandoraFMS/GIS.pm, lib/PandoraFMS/WMIServer.pm,
          lib/PandoraFMS/PluginServer.pm, lib/PandoraFMS/ProducerConsumerServer.pm,
          lib/PandoraFMS/PredictionServer.pm, lib/PandoraFMS/Core.pm,
          lib/PandoraFMS/ReconServer.pm, lib/PandoraFMS/DataServer.pm,
          bin/pandora_server, util/pandora_db.pl, util/gpx2pandora_agent_data.pl,
          util/pandora_manage.pl, util/pandora_dbstress.pl: Added the default library path
          used by RPM and DEB packages.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2755 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-05-19 16:59:00 +00:00
mdtrooper 306a8c5260 Lost changeLog.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2754 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-05-19 16:32:48 +00:00
mdtrooper d5c73f4fca 2010-05-18 Miguel de Dios <miguel.dedios@artica.es>
* DEBIAN/make_deb_package.sh: added parameter to make only packages of
	pear modules or not.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2753 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-05-19 16:29:14 +00:00
ramonn 659cfe1c17 2010-05-19 Ramon Novoa <rnovoa@artica.es>
* pandora_strutils.h, modules/pandora_module_odbc.h,
          modules/pandora_data.h, build.sh, pandora.h,
          udp_server/udp_server.h, Makefile.am: Small fixes so the agent
          builds under newer versions of MinGW.

        * installer/pandora.mpi: Updated build.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2752 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-05-19 15:21:10 +00:00
slerena 82c0d27dc5 2010-05-19 Sancho Lerena <slerena@artica.es>
* lib/PandoraFMS/DataServer.pm: XML data files coming from a disabled
        agent are now discarded.

        * util/pandora_manage.pl: Added CLI mode to disable/enable agents from
        a given group. This will help admins to implement recurrent downtime periods.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2751 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-05-19 13:40:21 +00:00
slerena 372f99f9b0 2010-05-18 Sancho Lerena <slerena@artica.es>
* pandora_server_upgrade: Fixed a check on pandora_db.pl script in cron.

        * lib/PandoraFMS/Config.pm: Version update to 3.1rc1 and build 100515




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2750 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-05-18 18:15:41 +00:00
ramonn 49432967a8 2010-05-18 Ramon Novoa <rnovoa@artica.es>
* pandora_agent: Added a data collection layer and native modules
          similar to those of the Windows agent.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2749 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-05-18 18:07:32 +00:00
slerena 549b2f45c7 2010-05-18 Sancho Lerena <slerena@artica.es>
* unix/pandora_agent_installer: New version of installer. Now allow
        to install the agent and all its dependencies, configuration and logfiles
        inside a specific directory, for example: /opt/pandora. That directory
        will contain all data, even the logs. Default configuration file and
        launcher daemon script are modified in realtime to have that custom
        defined directory. Removed "with-links" method.

        * *.conf: Minor modification to use the new method of install in a custom
        directory.

        * unix/pandora_agent_daemon: Build update and some small modifications
        to use the custom directory.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2748 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-05-18 16:09:06 +00:00
mdtrooper 0bfd78ee79 2010-05-18 Miguel de Dios <miguel.dedios@artica.es>
* include/fgraph.php: fixed the fgraph when cron get a report in PDF for to
	send, and this situation the fgraph execute in localhost althought it'snt
	login.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2746 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-05-18 15:32:43 +00:00
slerena 79c903ed03 2010-05-18 Sancho Lerena <slerena@artica.es>
* pandoradb_data.sql: Update build/version to rc1.

        * extras/pandoradb_migrate_v3.0_to_v3.1.sql: Revised upgrade script.
        Tested with several 3.0 versions.

        * pandora_console_upgrade: Updated script, tested to work with 3.1




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2745 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-05-18 12:28:36 +00:00
zarzuelo 656a0a1d21 2010-05-18 Sergio Martin <sergio.martin@artica.es>
* operation/agentes/ver_agente.php
	godmode/reporting/visual_console_builder.wizard.php
	godmode/reporting/visual_console_builder.php: Fixed the
	multiple agents selection on visual console wizard 
	for bug 2997750



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2744 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-05-18 12:10:39 +00:00
mdtrooper 20a4660d06 2010-05-18 Miguel de Dios <miguel.dedios@artica.es>
* include/javascript/pandora.js: added function 
	"agent_changed_by_multiple_agents_id" for response to change agent in
	wizard in visual console editor.

	* operation/agentes/ver_agente.php: added response to
	"get_agent_modules_json_for_multiple_agents_id" for the ajax previous
	function.
	
	* godmode/reporting/visual_console_builder.wizard.php: used new javascript
	function.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2743 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-05-18 10:03:06 +00:00
zarzuelo 0eaa5935cf 2010-05-17 Sergio Martin <sergio.martin@artica.es>
* lib/PandoraFMS/Core.pm: Fixed the Warning Monitor
	status



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2742 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-05-17 17:03:03 +00:00
zarzuelo 03712906ef 2010-05-17 Sergio Martin <sergio.martin@artica.es>
* include/languages/cs.po
	include/languages/nl.mo
	include/languages/pt_BR.po
	include/languages/es.po
	include/languages/pl.mo
	include/languages/ko.po
	include/languages/it.mo
	include/languages/sl.mo
	include/languages/sk.po
	include/languages/uk.po
	include/languages/ro.po
	include/languages/pt.mo
	include/languages/ast.mo
	include/languages/index.pot
	include/languages/bn.po
	include/languages/ar.po
	include/languages/cs.mo
	include/languages/pt_BR.mo
	include/languages/es.mo
	include/languages/ko.mo
	include/languages/fr.po
	include/languages/sk.mo
	include/languages/uk.mo
	include/languages/ro.mo
	include/languages/ca.po
	include/languages/da.po
	include/languages/tr.po
	include/languages/de.po
	include/languages/sv.po
	include/languages/ja.po
	include/languages/zh_TW.po
	include/languages/he.po
	include/languages/bn.mo
	include/languages/fi.po
	include/languages/ar.mo
	include/languages/hi.po
	include/languages/zh_CN.po
	include/languages/fr.mo
	include/languages/te.po
	include/languages/eu.po
	include/languages/hu.po
	include/languages/ca.mo
	include/languages/da.mo
	include/languages/tr.mo
	include/languages/de.mo
	include/languages/sv.mo
	include/languages/ru.po
	include/languages/ja.mo
	include/languages/zh_TW.mo
	include/languages/he.mo
	include/languages/fi.mo
	include/languages/hi.mo
	include/languages/zh_CN.mo
	include/languages/el.po
	include/languages/gl.po
	include/languages/te.mo
	include/languages/eu.mo
	include/languages/nl.po
	include/languages/hu.mo
	include/languages/pl.po
	include/languages/it.po
	include/languages/sl.po
	include/languages/pt.po
	include/languages/ru.mo
	include/languages/ast.po
	include/languages/el.mo
	include/languages/gl.mo: Updated the languages files
	from Launchpad



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2741 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-05-17 16:45:28 +00:00
mdtrooper b67dc821f7 2010-05-17 Miguel de Dios <miguel.dedios@artica.es>
* include/javascript/pandora_modules.js,
	godmode/agentes/module_manager_editor.php: fixed the snmp_walk for version
	2, 2c and 3. Need more test for version 3.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2740 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-05-17 12:08:44 +00:00
mdtrooper 7f245aa1dd 2010-05-17 Miguel de Dios <miguel.dedios@artica.es>
* include/javascript/pandora.js,
	godmode/reporting/visual_console_builder.wizard.php: fixed the select box
	modules for when select many agents.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2739 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-05-17 09:57:09 +00:00
zarzuelo d4bc94443a 2010-05-17 Sergio Martin <sergio.martin@artica.es>
* linux/pandora_agent.conf: Improved the default
	modules memused and proctotal for bug 3002626



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2738 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-05-17 09:52:36 +00:00
zarzuelo faf85431c3 2010-05-17 Sergio Martin <sergio.martin@artica.es>
* include/functions_reporting.php: Fixed the
	Warning monitor stauts in tactical view
	for bug: 3002602



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2737 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-05-17 08:45:08 +00:00
zarzuelo f2bc4f573c 2010-05-17 Sergio Martin <sergio.martin@artica.es>
* godmode/setup/gis_step_2.php
	godmode/setup/gis.php: Created error and
	successfuly messages when create, update or
	delete a map connection for bug 2994197



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2736 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-05-17 08:13:41 +00:00
zarzuelo 804158a672 2010-05-17 Sergio Martin <sergio.martin@artica.es>
* operation/extensions.php
	godmode/extensions.php: Fixed the undefined
	variable display on extensions sections
	for bug 2989967



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2735 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-05-17 07:34:38 +00:00
jsatoh 3257c25a01 2010-05-17 Junichi Satoh <junichi@rworks.jp>
* include/gettext.php: Changed the judgment method for 64bit systems.
	'x86_64' is not acceptable by some systems.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2734 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-05-17 03:31:18 +00:00
raulmateos a15281dcde 2010-05-16 Raul Mateos <raulofpandora@gmail.com>
* linux/pandora_agent_installer, linux/DEBIAN/make_deb_package.sh,
	linux/DEBIAN/control, linux/pandora_agent, linux/pandora_agent_daemon,
	linux/pandora_agent.conf: Updated build. Updated year.

git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2733 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-05-15 22:36:34 +00:00
raulmateos b9e1dedc7a 2010-05-16 Raul Mateos <raulofpandora@gmail.com>
* bin/pandora_server, lib/PandoraFMS/Config.pm, conf/pandora_server.conf,
	pandora_server_upgrade: Updated year. Clean code.

git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2732 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-05-15 22:32:56 +00:00
raulmateos 2807c127a2 2010-05-14 Raul Mateos <raulofpandora@gmail.com>
* operation/agentes/gis_view.php, tactical.php: Clean code. Updated year.
	* Changelog: Fixed language error from my last commit.

git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2731 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-05-14 12:55:16 +00:00
mdtrooper 0fecb4c483 2010-05-14 Miguel de Dios <miguel.dedios@artica.es>
* godmode/groups/group_list.php: fixed the request of group data when get
	data about "All" group.
	Fixes: #2993501



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2730 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-05-14 10:36:19 +00:00
zarzuelo cb392f83bd 2010-05-14 Sergio Martin <sergio.martin@artica.es>
* godmode/reporting/visual_console_builder.php: Fixed
	the adding at visual map only the agent if module is 
	no selected and only the module if is selected.
	Bug: 2989339



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2729 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-05-14 10:34:37 +00:00
mdtrooper b8efb9d0e1 2010-05-14 Miguel de Dios <miguel.dedios@artica.es>
* godmode/gis_maps/configure_gis_map.php: fixed the title of button to
	"update layer", and now by default the group of new layer is none.
	Fixes: #2990762



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2728 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-05-14 10:11:55 +00:00
zarzuelo 4bb0d7723d 2010-05-14 Sergio Martin <sergio.martin@artica.es>
* include/functions_db.php
	operation/agentes/ver_agente.php
	godmode/agentes/massive_edit_modules.php: Fixed the
	ACL check into groups combo for bug 3001500 and 
	All agents display for bug 2999431



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2727 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-05-14 09:25:39 +00:00
mdtrooper 6aa85414fd 2010-05-14 Miguel de Dios <miguel.dedios@artica.es>
* include/gettext.php: Sorry I forget part of changes in "fixed the bug of
	pseudo-gettext with diferent arquitectures. Now check the arquitecture
	before." 
	Fixes: #2991545
	
	* godmode/agentes/configurar_agente.php: fixed lost the require file.
	Fixes: #3000337



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2726 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-05-14 09:01:38 +00:00
raulmateos 16c2d2e811 2010-05-13 Raul Mateos <raulofpandora@gmail.com>
* operation/agentes/group_view.php: Clean code. Close tags. Now, if 
	there's no agent, it shows a text. Inefficient?
	* godmode/agentes/agent_manager: Solved typo with .png files, but
	those files doesn't exists in repository...
	*  ChangeLog: Changed date error from my last commit.

git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2725 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-05-13 18:29:46 +00:00
ramonn faa960ef84 2010-05-13 Ramon Novoa <rnovoa@artica.es>
* pandora_agent: Disabled the plugin command check. Was not working.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2724 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-05-13 16:54:31 +00:00
raulmateos e62f983f9b 2010-05-11 Raul Mateos <raulofpandora@gmail.com>
* install.php: Updated year. Clean code.

git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2723 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-05-13 16:44:27 +00:00
ramonn 7cb3412914 2010-05-13 Ramon Novoa <rnovoa@artica.es>
* pandora_windows_service.cc: Check the return codee of the tentacle
          client. Fixes bug #2972399.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2722 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-05-13 15:39:52 +00:00
zarzuelo 75c277c70d 2010-05-13 Sergio Martin <sergio.martin@artica.es>
* godmode/gis_maps/configure_gis_map.php: Fixed the 
	Gis map without map connection. Now is impossible 
	to create or update a GIS map without map connection
	Bug: 3000014



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2721 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-05-13 15:36:47 +00:00
mdtrooper e173dc11e8 2010-05-13 Miguel de Dios <miguel.dedios@artica.es>
* include/gettext.php: fixed the bug of pseudo-gettext with diferent
	arquitectures. Now check the arquitecture before. 
	Fixes: #2991545



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2720 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-05-13 15:30:57 +00:00
mdtrooper c436f75580 2010-05-13 Miguel de Dios <miguel.dedios@artica.es>
* pandoradb.sql: fixed the syntax of sql for compatibility of mysql 5.0 that
	this versión is used in Debian Lenny for example. Now run in 5.0 and next
	versións.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2719 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-05-13 15:14:38 +00:00