Skip to content
Snippets Groups Projects
Commit f08f9420 authored by totten's avatar totten
Browse files

Merge remote-tracking branch 'upstream/4.3' into 4.3-master-2013-04-16-10-35-08 

Conflicts:
	sql/civicrm_generated.mysql
	xml/version.xml
parents 1b68288c c16028a6
Branches
Tags
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 610 additions and 624 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment