Merge branch '2.5.x' into saas

Conflicts:
	airtime_mvc/tests/application/services/database/datasets/test_ccShowInsertedIntoDatabase.xml
This commit is contained in:
drigato 2015-01-23 16:24:09 -05:00
commit ef6572aea9
22 changed files with 22 additions and 22 deletions

View file

@ -32,4 +32,4 @@
<value></value>
</row>
</table>
</dataset>
</dataset>