Serbian Translate
Merge pull request #844 from m0k1/2.x

Serbian Translate
Merge branch '2.x' into 2.1
Merge branch '2.1' into 2.1_n