PHP 5.2 compatibility (ternary operator)
Merge branch 'fix-php52' of https://github.com/ziz/Edit-Flow into ziz-fix-php52