-
Marco Villegas authored
Conflifts have been solved trusting completely on github branch, but at the same time removing the $Id$ CVS keyword that do not make sense any more. Conflicts: README.txt css/views-admin.css css/views-list-rtl.css css/views-list.css css/views.css docs/docs.php handlers/views_handler_area.inc handlers/views_handler_area_text.inc handlers/views_handler_argument.inc handlers/views_handler_argument_date.inc handlers/views_handler_argument_formula.inc handlers/views_handler_argument_group_by_numeric.inc handlers/views_handler_argument_many_to_one.inc handlers/views_handler_argument_null.inc handlers/views_handler_argument_numeric.inc handlers/views_handler_argument_string.inc handlers/views_handler_field.inc handlers/views_handler_field_boolean.inc handlers/views_handler_field_counter.inc handlers/views_handler_field_custom.inc handlers/views_handler_field_date.inc handlers/views_handler_field_group_by_numeric.inc handlers/views_h...
98b13e41