beremiz

merge

2014-11-12, mjsousa
144cf3af992c
merge
/**
* No platform specific code for "Generic" target
**/