Merge branch 'master' into develv1.6
commit2e8ae5fe1a94427fd656f9345f17a057ca154b08
authorAleksandar Erkalovic <aerkalov@gmail.com>
Tue, 16 Apr 2013 13:08:06 +0000 (16 15:08 +0200)
committerAleksandar Erkalovic <aerkalov@gmail.com>
Tue, 16 Apr 2013 13:08:06 +0000 (16 15:08 +0200)
treea8ddd1424c8d42bd30a979e186673f3ec248ed4f
parent652750856b353405220603e392b6a390784637db
parent156ea0838d758719a26068d21105f2e57adc0b08
Merge branch 'master' into devel