Commit Graph

3349 Commits

Author SHA1 Message Date
mdtrooper 761a9b3924 2014-08-12 Miguel de Dios <miguel.dedios@artica.es>
* general/header.php, godmode/setup/setup_general.php,
	include/functions_clippy.php, include/functions_config.php,
	include/help/clippy/homepage.php: wip in the clippy.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10404 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-08-12 09:36:05 +00:00
mdtrooper 0edbe523d2 2014-08-11 Miguel de Dios <miguel.dedios@artica.es>
* include/help/clippy/godmode_agentes_modificar_agente.php,
	include/help/clippy/homepage.php,
	include/help/clippy/godmode_agentes_configurar_agente.php,
	include/functions_clippy.php: wip in the clippy.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10399 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-08-11 14:30:09 +00:00
mdtrooper f956eb057c 2014-08-08 Miguel de Dios <miguel.dedios@artica.es>
* include/functions.php,
	include/help/clippy/godmode_agentes_modificar_agente.php,
	include/help/clippy/homepage.php,
	include/help/clippy/godmode_agentes_configurar_agente.php,
	include/javascript/intro.js,
	include/javascript/introjs.css,
	include/javascript/clippy.js,
	include/functions_ui.php,
	include/functions_clippy.php,
	index.php,
	general/header.php: first version of the new feature a annoying
	clippy such as the lovely micro$oft mascot.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10393 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-08-08 15:11:00 +00:00
alexhigh c03ac82eee 2014-08-05 Alejandro Gallardo <alejandro.gallardo@artica.es>
* general/main_menu.php: Fixed the menu position when
	it's fixed and the header's not.

	* include/functions_graph.php,
	  include/graphs/pandora.d3.js: Added colors to the elements
	depending on their status on the functions 'sunburst' and
	'graph_monitor_wheel'.

	* include/styles/pandora.css: Fixed the z-index of the
	shortcut bar.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10382 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-08-05 13:09:46 +00:00
alexhigh 657c1ab9b0 2014-08-04 Alejandro Gallardo <alejandro.gallardo@artica.es>
* general/header.php: Now the header can be configured
	to be fixed at the top.

	* general/main_menu.php: Now the menu can be configured
	to be fixed at the left.

	* godmode/setup/setup_visuals.php,
	  include/functions_config.php: Added new options to
	enable the fixed header and menu.

	* include/styles/menu.css,
	  include/styles/pandora.css: Changes on the menu styles.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10377 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-08-04 16:50:36 +00:00
mdtrooper 706eef436f 2014-08-04 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_config.php,
	include/functions_update_manager.php: some fixes into the update
	manager.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10376 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-08-04 16:00:58 +00:00
mdtrooper 024d4e6cd1 2014-08-04 Miguel de Dios <miguel.dedios@artica.es>
* include/config_process.php: added global config var for the
	quote strings (for example, PostgreSQL).




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10374 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-08-04 11:38:00 +00:00
jsatoh 676e9b66d6 2014-08-03 Junichi Satoh <junichi@rworks.jp>
* include/functions_ui.php: Fixed that the fast forward and the going
	to the last of pagination doesn't work in the modal window for module
	data display.
	And fixed incorrect offset calculation for the fast forward.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10373 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-08-03 01:52:06 +00:00
mdtrooper 862d16ccf9 2014-07-31 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_networkmap.php, include/functions_graph.php,
	include/db/postgresql.php, include/db/oracle.php,
	include/functions_api.php, extensions/agents_alerts.php,
	operation/search_main.php, operation/search_agents.getdata.php,
	operation/agentes/status_monitor.php,
	operation/agentes/networkmap.topology.php,
	operation/agentes/ver_agente.php,
	operation/search_modules.getdata.php, operation/search_results.php,
	operation/events/events_list.php,
	godmode/alerts/alert_list.builder.php,
	godmode/alerts/configure_alert_template.php,
	godmode/modules/manage_network_components_form.php,
	godmode/reporting/reporting_builder.php,
	godmode/reporting/map_builder.php: tiny fixes for the improve the
	support of postgreSQL databases.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10368 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-07-31 14:27:43 +00:00
mdtrooper 61100077c1 2014-07-30 Miguel de Dios <miguel.dedios@artica.es>
* include/ajax/module.php: tiny fixes for the improve the support of
	postgreSQL databases.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10367 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-07-30 16:54:10 +00:00
alexhigh 8ed6e5b5d4 2014-07-30 Alejandro Gallardo <alejandro.gallardo@artica.es>
* include/functions_graph.php: Finished the function
	"graph_monitor_wheel". This function returns a sunburst
	graph representing all the group>agent>module group>module
	hierarchy.
	
	* include/functions_groups.php: Added the function
	"groups_get_tree". This function returns an array representing
	the group hierarchy of the passed groups array.

	* include/graphs/pandora.d3.js: Improved the function
	"sunburst". Now this graph can show tooltips.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10366 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-07-30 15:58:27 +00:00
mdtrooper 30c9e1a9ef 2014-07-30 Miguel de Dios <miguel.dedios@artica.es>
* godmode/servers/manage_recontask.php,
	godmode/servers/manage_recontask_form.php,
	include/functions_treeview.php, include/ajax/module.php,
	include/functions_reporting.php, include/db/postgresql.php,
	include/functions_servers.php, operation/agentes/estado_agente.php,
	operation/tree.php: tiny fixes for the improve
	the support of postgreSQL databases.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10365 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-07-30 14:29:44 +00:00
mdtrooper 6488476d99 2014-07-29 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_graph.php, include/functions_reporting.php,
	operation/agentes/estado_monitores.php: tiny fixes for the improve
	the support of postgreSQL databases.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10361 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-07-29 15:11:23 +00:00
jsatoh bf919297b4 2014-07-29 Junichi Satoh <junichi@rworks.jp>
* include/functions_events.php: Fixed a bug that event's comment
	is not shown when it includes newline.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10360 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-07-29 06:42:33 +00:00
mdtrooper d11b4d0cb3 2014-07-24 Miguel de Dios <miguel.dedios@artica.es>
* operation/snmpconsole/snmp_view.php,
	operation/events/events_list.php, operation/incidents/incident.php,
	extensions/files_repo.php,
	extensions/files_repo/sql/files_repo.postgreSQL.sql,
	extensions/files_repo/functions_files_repo.php,
	extensions/files_repo/files_repo_list.php,
	godmode/agentes/modificar_agente.php,
	godmode/snmpconsole/snmp_alert.php, godmode/db/db_info.php,
	include/functions_graph.php, include/functions_db.php,
	include/db/postgresql.php, include/db/oracle.php,
	include/db/mysql.php, include/functions_update_manager.php,
	include/functions_events.php, include/graphs/functions_flot.php,
	include/graphs/fgraph.php: tiny fixes for the improve the support of
	postgreSQL databases.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10354 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-07-24 16:02:06 +00:00
mdtrooper 4afc69698e 2014-07-23 Miguel de Dios <miguel.dedios@artica.es>
* extensions/module_groups.php, extensions/agents_alerts.php,
	include/functions_agents.php, operation/agentes/exportdata.php: tiny
	fixes for the improve the support of postgreSQL databases.
	
	* include/functions_db.php: fix blank screen when the connection
	fail, now it shows the error message again.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10353 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-07-24 08:40:59 +00:00
mdtrooper f0d2ccf98d 2014-07-23 Miguel de Dios <miguel.dedios@artica.es>
* include/config_process.php, operation/agentes/status_monitor.php,
	operation/agentes/estado_generalagente.php,
	operation/agentes/estado_agente.php: tiny fixes for the improve the
	support of postgreSQL databases.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10352 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-07-23 16:59:05 +00:00
mdtrooper 807faa6992 2014-07-23 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_servers.php, include/functions_reporting.php:
	tiny fixes for the improve the support of postgreSQL databases.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10351 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-07-23 14:42:55 +00:00
juanmanuelr 5f90d6f2d0 2014-07-22 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/ajax/events.php: Fixed custom fields view in
        metaconsole event extended view.

        This is my last commit for Pandora guys! Bye ;-)



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10347 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-07-22 17:41:39 +00:00
mdtrooper 012ae953a0 2014-07-22 Miguel de Dios <miguel.dedios@artica.es>
* 


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10346 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-07-22 16:07:31 +00:00
mdtrooper e961f3dca9 2014-07-18 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_graph.php, include/functions_reporting.php:
	fixed to show the unknown graph in simple graph.
	
	INCIDENT: #1035




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10343 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-07-18 09:45:20 +00:00
mdtrooper 50885d86d2 2014-07-17 Miguel de Dios <miguel.dedios@artica.es>
* include/auth/ldap.php, include/auth/mysql.php: fixed the
	parameters with white spaces.
	
	INCIDENT: #1063




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10342 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-07-17 16:07:07 +00:00
mdtrooper 9b978f6674 2014-07-17 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_groups.php: added parameter to avoid the check
	the propagation in the function "groups_get_childrens".
	
	* include/functions_networkmap.php,
	operation/agentes/networkmap.php,
	operation/agentes/networkmap.topology.php: added feature to show the
	agents in subgroups (or not).
	
	INCIDENT: #1018




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10341 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-07-17 14:28:59 +00:00
vgilc 81df6e92fb 2014-07-14 Vanessa Gil <vanessa.gil@artica.es>
* godmode/admin_access_log.php
	  include/functions.php: Added export to csv.

	* godmode/audit_log_csv.php: Added file.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10339 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-07-14 06:18:11 +00:00
mdtrooper 7068f2e5a3 2014-07-10 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_api.php: fixed the call "set_update_agent"
	because before the call get the id_server but this data never
	was translated to name_server. And added id_server into the call
	"get_pandora_servers" in the last position.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10333 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-07-10 09:32:14 +00:00
mdtrooper ebea296ac1 2014-07-10 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_api.php: restored the parameter name server in
	the api call "set_new_agent", thanks KOSAKA.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10332 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-07-10 09:10:30 +00:00
jsatoh f1dfa41b45 2014-07-10 Junichi Satoh <junichi@rworks.jp>
* include/help/ja/help_snmp_alert_field1.php: Updated help.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10331 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-07-10 07:08:36 +00:00
mariopulido87 c0d3b1bfce 2014-07-09 Mario Pulido <mario.pulido@artica.es>
* include/help/ja/help_snmp_alert_field1.php: Added macros snmp alert help




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10330 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-07-09 10:05:42 +00:00
jsatoh d424c882af 2014-07-09 Junichi Satoh <junichi@rworks.jp>
* include/help/ja/help_snmp_alert_field1.php: Updated help.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10329 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-07-09 06:43:30 +00:00
jsatoh 2233e99edf 2014-07-09 Junichi Satoh <junichi@rworks.jp>
* include/functions_events.php, operation/events/events.php,
	operation/events/events_list.php: Replaced json_encode()
	with io_json_mb_encode() to avoid invalid encoding with multi-byte
	characters.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10328 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-07-09 05:08:55 +00:00
mariopulido87 dc8ff30972 2014-07-08 Mario Pulido <mario.pulido@artica.es>
* include/help/en/help_snmp_alert_field1.php,
        include/help/es/help_snmp_alert_field1.php: Change macros snmp alert help




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10327 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-07-08 16:01:16 +00:00
hkosaka a73cf5731f 2014-07-08 Hirofumi Kosaka <kosaka@rworks.jp>
* include/functions_api.php: Fixed that 'set enable_module'
	had not worked.

	MERGED FROM BRANCH 5.0



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10323 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-07-08 03:50:42 +00:00
mdtrooper 7bc036aafe 2014-07-07 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_visual_map.php: show in the tooltip of
	"static graph" the last value of module.
	
	INCIDENT: #1014 




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10321 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-07-07 11:19:13 +00:00
ramonn cfe028768b 2014-07-04 Ramon Novoa <rnovoa@artica.es>
* include/functions_graph.php: When drawing charts, propagate the last value
	  in the database instead of the value of the last interval (which is the
	  average value for that interval).

	* operation/agentes/estado_monitores.php: Show events for boolean modules by default.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10316 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-07-04 15:28:24 +00:00
mdtrooper a87c0a7d9f 2014-07-04 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_config.php, include/functions_extensions.php:
	fixed the show old update manager and set the correct link in the
	header warning message to update manager.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10315 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-07-04 11:49:54 +00:00
pandora-release dc9aa06945 Updated version and build strings for the 5.1 release.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10313 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-06-30 12:37:47 +00:00
koichirok 75c2d4590e 2014-06-30 Koichiro KIKUCHI <koichiro@rworks.jp>
* extensions/agents_modules.php,
	  include/functions_events.php,
	  operation/agentes/estado_monitores.php,
	  operation/agentes/status_monitor.php,
	  operation/search_modules.php,
	  operation/tree.php: Fixed garbled title issue in the module graph.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10309 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-06-30 07:54:11 +00:00
pandora-release db14e003d4 Auto-updated build strings.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10306 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-06-29 22:01:25 +00:00
pandora-release c9d9c3dd4c Auto-updated build strings.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10303 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-06-28 22:01:19 +00:00
pandora-release c2664dcf53 Auto-updated build strings.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10300 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-06-27 22:01:37 +00:00
pandora-release a7c83f3244 Auto-updated build strings.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10295 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-06-26 22:01:24 +00:00
mdtrooper 64438e287f 2014-06-26 Miguel de Dios <miguel.dedios@artica.es>
* godmode/update_manager/update_manager.offline.php,
	godmode/update_manager/update_manager.online.php,
	include/functions_update_manager.php,
	include/ajax/update_manager.ajax.php,
	include/javascript/update_manager.js: a lot of fixes into the update
	manager.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10293 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-06-26 15:00:43 +00:00
vgilc b1cce886b8 2014-06-26 Vanessa Gil <vanessa.gil@artica.es>
* include/languages/ar.mo
	  include/languages/ar.po
	  include/languages/ca.mo
	  include/languages/ca.po
 	  include/languages/cs.mo
	  include/languages/cs.po
	  include/languages/de.mo
	  include/languages/de.po
	  include/languages/el.mo
	  include/languages/el.po
	  include/languages/en_GB.mo
	  include/languages/en_GB.po
	  include/languages/es.mo
	  include/languages/es.po
	  include/languages/fr.po
	  include/languages/fr.mo
	  include/languages/it.po
	  include/languages/it.mo
	  include/languages/ja.po
	  include/languages/ja.mo
	  include/languages/nl.po
	  include/languages/nl.mo
	  include/languages/pl.po
	  include/languages/pl.mo
	  include/languages/pt.po
	  include/languages/pt.mo
	  include/languages/pt_BR.po
	  include/languages/pt_BR.mo
	  include/languages/ru.po
	  include/languages/ru.mo
	  include/languages/sk.po
	  include/languages/sk.mo
	  include/languages/tr.po
	  include/languages/tr.mo
	  include/languages/zh_CN.po
	  include/languages/zh_CN.mo: Updated translations.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10292 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-06-26 12:23:28 +00:00
alexhigh b2a71b9f02 2014-06-26 Alejandro Gallardo <alejandro.gallardo@artica.es>
* operation/netflow/nf_live_view.php,
	  godmode/netflow/nf_edit.php,
	  godmode/servers/manage_recontask_form.php,
	  godmode/servers/plugin.php,
	  godmode/setup/setup_general.php: Added messages to
	warn about incompatibilities for Windows users.

	* include/functions_graph.php: Added the function
	"graph_monitor_wheel".

	* include/graphs/functions_d3.php: Added the function
	"d3_sunburst_graph".

	* include/graphs/pandora.d3.js: Added the function "sunburst".


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10291 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-06-26 11:32:14 +00:00
pandora-release f2d05bc443 Auto-updated build strings.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10287 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-06-25 22:01:20 +00:00
mdtrooper 2369cb9474 2014-06-25 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_config.php: set the default size of networkmap
	to 900 instead 800.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10286 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-06-25 17:43:10 +00:00
pandora-release ce8564483b Updated version and build strings for the 5.1RC2 release.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10285 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-06-25 14:49:43 +00:00
mdtrooper 5e3dbbb23d 2014-06-25 Miguel de Dios <miguel.dedios@artica.es>
* operation/agentes/networkmap.topology.php,
	include/functions_networkmap.php: fixed the networkmaps of level 2,
	now the nodes without conections with others are more or less
	clean posicioned into the networkmap.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10284 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-06-25 10:49:11 +00:00
jsatoh 29ffc516cc 2014-06-25 Junichi Satoh <junichi@rworks.jp>
* include/help/ja/help_ff_interval.php,
	include/help/ja/help_ff_timeout.php: Translated to Japanese.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10283 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-06-25 00:47:24 +00:00
pandora-release 3c54c37a41 Auto-updated build strings.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10280 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-06-24 22:01:24 +00:00