Changed the if-elseif-else sequence to multiple ifs and return
Authored by: viraajn 2013-10-08
Parent: [r1387]
Child: [r1389]
