Commit Graph

271 Commits

Author SHA1 Message Date
zarzuelo f300fd0a1f 2010-11-04 Sergio Martin <sergio.martin@artica.es>
* lib/PandoraFMS/DB.pm
	lib/PandoraFMS/Core.pm
	util/pandora_manage.pl: Improved the policies
	appliement with checks and the external
	alerts addition



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3522 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-11-04 17:35:37 +00:00
ramonn 9b8b02539d 2010-11-03 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/Tools.pm: limpia_cadena removes unwanted
	  characters instead or replacing them with blank spaces.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3512 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-11-03 19:20:12 +00:00
zarzuelo 956a3a0955 2010-11-02 Sergio Martin <sergio.martin@artica.es>
* lib/PandoraFMS/DB.pm
	lib/PandoraFMS/Core.pm
	lib/PandoraFMS/ReconServer.pm
	lib/PandoraFMS/DataServer.pm
	lib/PandoraFMS/Tools.pm: Fixed insert db operations
	in server to store the html entities. This improves
	fix bug 3096436



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3499 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-11-02 17:26:34 +00:00
slerena 7fbc78e892 2010-11-01 Sancho Lerena <slerena@artica.es>
* DEBIAN/control,
        DEBIAN/make_deb_package.sh
        pandora_server.spec
        lib/PandoraFMS/Config.pm
        pandora_server.redhat.spec:  Version updates and small changes
        for packaging the 3.2 RC1 version in the next days/hours.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3485 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-11-01 12:34:39 +00:00
ramonn 52da447645 2010-10-25 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/Core.pm: Fixed a bug that made the server crash when
	  trying to match an alert with an invalid regular expression.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3463 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-10-25 17:29:11 +00:00
slerena b6f5e9996c 2010-10-22 Sancho Lerena <slerena@artica.es>
* Config.pm: Parsing for mta_from doesn't remove blanks, allowing to
    use a Normal name + Email address in the from.

    * Tools.pm: Email output is parsed with a html decode first. 
    Added timeticks option for tools (intented to use in the future).

    * pandora_server.conf: Example of usage in the mta_from with a fully
    composed email address.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3452 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-10-22 14:03:49 +00:00
jsatoh 5abe1cea48 2010-10-22 Junichi Satoh <junichi@rworks.jp>
* lib/PandoraFMS/NetworkServer.pm: Deleted Solaris specific SNMPGET
	definition. It is the same as Linux.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3446 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-10-22 05:18:36 +00:00
jsatoh 5db9aba7c6 2010-10-22 Junichi Satoh <junichi@rworks.jp>
* lib/PandoraFMS/Tools.pm: Changed ping count to for() loop instead of
	using count(-c) option in pandora_ping(). By it, ping execution can be
	finished in short time.
	Added support for Solaris.
	Changed some ping usage for FreeBSD.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3445 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-10-22 05:12:03 +00:00
zarzuelo 3ffd3faecc 2010-10-21 Sergio Martin <sergio.martin@artica.es>
* lib/PandoraFMS/DB.pm: Added a generic update function to return
	the number of changes

	* util/pandora_manage.pl: Added the unblock policies to the CLI and
	the block/unblock policies when it are applied.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3441 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-10-21 14:26:46 +00:00
jsatoh 63d971d91d 2010-10-21 Junichi Satoh <junichi@rworks.jp>
* lib/PandoraFMS/Tools.pm: Fixed timeout option for FreeBSD ping.
	(Note: In ping6, '-t' option is not implemented. So, 'networktimeout'
	is not used with ping6.)



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3440 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-10-21 10:12:38 +00:00
jsatoh af7facace8 2010-10-21 Junichi Satoh <junichi@rworks.jp>
* lib/PandoraFMS/NetworkServer.pm: Deleted FreeBSD specific SNMPGET
	definition. It is the same as Linux.

	* lib/PandoraFMS/Tools.pm: Added FreeBSD specific Ping function.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3438 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-10-21 06:43:36 +00:00
ramonn d8dccf664c 2010-10-20 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/ReconServer.pm: Pass the recon task group_id and
	  create_incident parameters to the recon script.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3437 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-10-20 16:42:06 +00:00
ramonn 2fef56e882 2010-10-20 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/ReconServer.pm: Pass the recon task id to the recon
	  script.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3432 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-10-20 14:08:13 +00:00
slerena 7092c0965f 2010-10-20 Sancho Lerena <slerena@artica.es>
* conf/pandora_server.conf.windows: Sample conf for running pandora server
    on Windows (see windows.README).

    * lib/PandoraFMS/NetworkServer.pm: Adapted to have SNMPGET and PING functions
    redefined by each SO, this will allow to have native support on pandora
    to run under different OS (need to check FreeBSD and Solaris!). Windows
    support implemented.

    * lib/PandoraFMS/Core.pm: Removed ping functions here and moved to Tools.pm

    * lib/PandoraFMS/Tools.pm: Adapted Ping functions to work with any SO, at
    this time Linux and Windows only, need to check for Solaris and BSD.

    * util/windows.README: Small doc on how to make Pandora Server work on 
    Windows servers.

    * util/pandora_logrotate: Removed the index in the logrotation.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3431 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-10-20 13:54:43 +00:00
zarzuelo 4846c2dd33 2010-10-19 Sergio Martin <sergio.martin@artica.es>
* lib/PandoraFMS/Core.pm
	util/pandora_manage.pl: Moved and renamed the module
	creation from hash function from CLI to Core



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3420 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-10-19 09:53:16 +00:00
zarzuelo bd958a01d1 2010-10-18 Sergio Martin <sergio.martin@artica.es>
* lib/PandoraFMS/DB.pm
	util/pandora_manage.pl: Splitted in 4 parameters the CLI module creation
	parameter: create_data_module, create_network_module, create_snmp_module, 
	create_plugin_module



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3417 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-10-18 16:21:13 +00:00
ramonn 803922fa78 2010-10-15 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/ReconServer.pm: Added support for recon scripts.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3411 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-10-15 13:00:25 +00:00
slerena 82b6c16e2a 2010-10-14 Sancho Lerena <slerena@artica.es>
* PandoraFMS/Core.pm: Fixed bug #3085249 about empty
        extra_macros hash.

        * util/pandora_backup.sh: Fixed bug #3080826 about backup of
        links, now are using -h parameter on tar to get the real file instead the
        link.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3398 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-10-14 12:08:45 +00:00
slerena 1054a09a95 2010-10-13 Sancho Lerena <slerena@artica.es>
* Core.pm: Force XML::Simple to use XML::Parser instead SAX to manage XML
    due a bug processing some XML with blank spaces.

    * DataServer.pm: Checking for BADXML is 2 times with 2 secs of delay now. 
    Aditional check before deleting / procesing XML.

    * pandora_server: Added handle of BadXML error to avoid see "unhandled" 
    errors on log, and set to verbose level 2.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3388 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-10-13 15:15:06 +00:00
slerena 24dd478a46 2010-10-07 Sancho Lerena <slerena@artica.es>
* conf/pandora_server.conf: Removed multicast options

    * Makefile.PL: Removed need for dependencies on Mail::Sendmail
    and Traceroute::PurePerl, now are included in the Pandora FMS
    distribution.

    * lib/PandoraFMS/Config.pm: Removed options for multicast

    * lib/PandoraFMS/Traceroute.pm,
      lib/PandoraFMS/Sendmail.pm,
      lib/PandoraFMS/Traceroute/PurePerl.pm: Now included on Pandora FMS
    distribution, this will help to do easier installs of Pandora, because
    that packages was difficult to build/install in different distros.

    * lib/PandoraFMS/Core.pm: Removed the old multicast-on change enterprise
    feature, not used/supported anymore.

    * lib/PandoraFMS/ReconServer.pm: Now uses the internal Traceroute Pureperl
    implementation.

    * lib/PandoraFMS/Tools.pm: Now uses the internal Mail::Sendmail copy.

    * bin/pandora_server: Removed the multicast option from main loop.

    * FreeBSD/pandora_server.conf: Removed multicast from options.

    * util/mcast_client.pl: Deleted sample client for multicast.

    * util/pandora_logrotate: Updated the rotate options for SNMP logfile.

    * util/compaq_chassis_trap_manager2.pl: Added sample of SNMP Trap           
    postprocessor.

    * pandora_server.redhat.spec,
      pandora_server.spec,
      DEBIAN/control: Updated packages deps and other minor changes (xprobe2 is not
      mandatory now).



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3365 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-10-07 15:09:04 +00:00
ramonn 82c6a9afd6 2010-10-06 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/Core.pm: Retrieve agent information before the module
	  type. Fixes bug #3080827.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3357 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-10-06 17:03:36 +00:00
zarzuelo aa26de3130 2010-09-24 Sergio Martin <sergio.martin@artica.es>
* lib/PandoraFMS/Tools.pm: Moved the util functions 
	from pandora_manage to Tools.
	* util/pandora_manage.pl: Added the apply policy
	feature: includen conf file management; modules, alerts
	and collection creation 



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3290 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-09-24 11:09:44 +00:00
zarzuelo de897c51a1 2010-09-23 Sergio Martin <sergio.martin@artica.es>
* lib/PandoraFMS/DB.pm: Improved the db_process_insert
	function against the null values



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3282 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-09-23 11:29:08 +00:00
zarzuelo c3d5b3cb8d 2010-09-23 Sergio Martin <sergio.martin@artica.es>
* lib/PandoraFMS/DB.pm: Added a function db_process_insert
	to insert a generic query receiving a hash reference with
	the parameters (columns in index and value in values)



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3280 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-09-23 08:16:44 +00:00
ramonn 2cc24ef061 2010-09-22 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/Core.pm: Fixed a couple of missing macros in 
	  SNMP alerts.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3272 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-09-22 11:26:12 +00:00
ramonn 41b8c62382 2010-09-21 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/DataServer.pm: Do not update agent configuration if
	  not in learning mode. Fixes bug #3069710.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3268 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-09-21 15:32:53 +00:00
ramonn 5f5a8ff687 2010-09-20 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/Core.pm, lib/PandoraFMS/DataServer.pm: Update module
	  configuration from XML data files.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3262 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-09-20 17:01:27 +00:00
ramonn c3caf80844 2010-09-14 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/Core.pm: Do not execute alerts in stand-by.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3244 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-09-14 10:32:11 +00:00
ramonn 1e3589ffa0 2010-09-10 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/NetworkServer.pm,
          lib/PandoraFMS/Core.pm: Fixed some prototypes that led to warnings
          in recent versions of PERL. This fixes bug #3061906.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3237 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-09-10 09:42:32 +00:00
ramonn 55f61be126 2010-09-09 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/Core.pm: Fixed alert behaviour when time_from is
          greater than time_to. Fixes bug #3048043.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3236 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-09-09 18:14:05 +00:00
slerena 1c433f2162 2010-09-08 Sancho Lerena <slerena@artica.es>
* lib/PandoraFMS/SNMPServer.pm
        lib/PandoraFMS/Core.pm: SNMP Trap console doesnt send trap value
        to alert function. Now does :-)




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3230 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-09-08 16:53:44 +00:00
slerena 7cced036f9 2010-08-18 Sancho Lerena <slerena@artica.es>
* lib/PandoraFMS/Core.pm: Alerts now uses _timestamp_ macro with the
        timestamp of the data (if provided), not the present time. Thanks
        to Daniel Vasconcelos for his patch (SF Tracker id #3044326).



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3154 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-08-18 17:31:19 +00:00
slerena 15ecbbd3e0 2010-08-18 Sancho Lerena <slerena@artica.es>
* lib/PandoraFMS/ReconServer.pm: Fixed some problems with traceroute.
        Added feature to use a specific snmpcommunity in all modules created
        by a recon task.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3151 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-08-18 11:37:47 +00:00
ramonn 8610dc0b81 2010-08-12 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/Core.pm, lib/PandoraFMS/DataServer.pm: Added support
          for unknown status alerts. Style fixes.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3133 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-08-12 12:42:56 +00:00
ramonn 5e6aed9fe8 2010-08-10 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/SNMPServer.pm: Added support for SNMP filters.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3124 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-08-10 17:58:36 +00:00
slerena 173dcfd2ee 2010-08-10 Sancho Lerena <slerena@artica.es>
* lib/PandoraFMS/Config.pm: Updated build and development
        version.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3117 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-08-10 10:34:05 +00:00
ramonn 9a64c9e01e 2010-08-04 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/Core.pm: Select uninitialized keep alive modules.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3090 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-08-04 10:44:29 +00:00
ramonn d95c1f3187 2010-07-30 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/Core.pm: Do not mark async modules as unknown.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3081 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-07-30 10:27:16 +00:00
ramonn 0f5e53d745 2010-07-30 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/Core.pm, bin/pandora_server: Added a real unknown
          status.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3080 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-07-30 09:27:06 +00:00
jsatoh a478cb3951 2010-07-28 Junichi Satoh <junichi@rworks.jp>
* lib/PandoraFMS/PredictionServer.pm: Fixed problem that pandora
	server daemon is aborted by division by zero, if numeric data to
	predict are mostly 0.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3071 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-07-28 01:10:27 +00:00
ramonn ccd952497e 2010-07-27 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/Core.pm: Make sure delete_pending is set to 0
          when selecting keepalive modules.

        * lib/PandoraFMS/DataServer.pm: Do not read more than max_queue_files
          files. Suppressed some warnings.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3069 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-07-27 17:12:17 +00:00
ramonn 402788e97c 2010-07-27 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/Core.pm: Removed a misplaced parenthesis.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3068 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-07-27 11:05:28 +00:00
ramonn 8295dcbdf8 2010-07-26 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/Core.pm: Do not compress data for async modules.

        * lib/PandoraFMS/DataServer.pm: Check that the file exists before
          trying to parse the XML to avoid XML::Simple error messages.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3060 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-07-26 11:51:49 +00:00
ramonn 51e4776428 2010-07-22 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/DataServer.pm: Sort files by creation date before
          queuing them. Fixes bug #3031780.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3053 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-07-22 11:00:37 +00:00
ramonn cfd5d31396 2010-07-20 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/SNMPServer.pm: Add extended information when saving
          an SNMP trap to a module.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3042 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-07-20 16:30:18 +00:00
zarzuelo 72f87b1699 2010-07-14 Sergio Martin <sergio.martin@artica.es>
* lib/PandoraFMS/Core.pm
	util/pandora_manage.pl: Added a create incident feature to
	CLI for pending task: 3019638



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3006 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-07-14 17:03:14 +00:00
ramonn 207e8625b9 2010-07-08 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/PluginServer.pm: Quote the command passed to
          pandora_exec.

        * bin/pandora_exec: Do not verify the command to allow pipes and complex
          commands.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2981 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-07-08 15:10:12 +00:00
ramonn a8cbe503ef 2010-07-07 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/Core.pm: Verify that log4x data is available
          before trying to read it.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2968 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-07-07 11:38:42 +00:00
darode a862f836cc 2010-07-06 Dario Rodriguez <dario.rodriguez@artica.es>
* lib/PandoraFMS/Core.pm, ReconServer.pm, DataServer.pm: Delete 
	$address_id paremeter from function pandora_create_agent()

	* util/pandora_manage.pl: Delete $address_id paremeter from function 
	pandora_create_agent()
	Fixes bug #3006770



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2967 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-07-06 15:06:00 +00:00
slerena e77fd3d5cc 2010-06-10 Sancho Lerena <slerena@artica.es>
* lib/PandoraFMS/Core.pm: Redefine downtime name and description if
	not defined.

	* lib/PandoraFMS/Tools.pm: Octopus is now known as Octopods.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2900 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-06-10 09:25:26 +00:00