- Merge devel-framework branch, resolved conflicts

alecpl

2012-04-13 0c259682f65eaaf23ea4ccb56a706d6baf3007e4

1
tinyMCE.addI18n('bs.advhr_dlg',{size:"Visina",noshade:"Bez sjene",width:"\u0160irina",normal:"Normal",widthunits:"Units"});