Merge branch 'live' of vcs.fsf.org:civicrm-core into live
authork054 <kosa@riseup.net>
Thu, 4 Feb 2016 22:29:13 +0000 (17:29 -0500)
committerk054 <kosa@riseup.net>
Thu, 4 Feb 2016 22:29:13 +0000 (17:29 -0500)
commitf5acdec0e89bcdad70cb7af074209def899b46e4
treeb3eee69a39851acf3b52cd3171ddd6465e76f938
parentdb64d3e10fed75ce096f6076e6cedaf31fa486a4
parentc4e58e3e1ef467290252075ee5c2f6a63f190b3f
Merge branch 'live' of vcs.fsf.org:civicrm-core into live