Mario de Sousa <msousa@fe.up.pt> [Mon, 03 Dec 2012 18:44:16 +0000] rev 766
merge
Manuele Conti <conti.ma@alice.it> [Sun, 02 Dec 2012 18:20:02 +0100] rev 765
Remove Ambiguous enumerate value in enum conversion functions.
Manuele Conti <conti.ma@alice.it> [Sun, 02 Dec 2012 12:30:41 +0100] rev 764
Fix enum conversion function to string.