beremiz

merge

2014-07-08, mjsousa
3eda8d8f622d
merge
/**
* No platform specific code for "Generic" target
**/