Merge branch 'devel' into merge merge
authorThadeu Lima de Souza Cascardo <cascardo@cascardo.eti.br>
Tue, 2 Sep 2014 08:49:47 +0000 (05:49 -0300)
committerThadeu Lima de Souza Cascardo <cascardo@cascardo.eti.br>
Tue, 2 Sep 2014 08:49:47 +0000 (05:49 -0300)
commitac9821e844f5af85a844d9546e1e7008f8cf5f09
tree1f5c87da82a8c35b785d4c6a7bb078c1ab54986b
parent560a9afab79d45962c6490e3228d792b7412cca0
parenta86b1071862ce553d02e0f34fc84a417473c2263
Merge branch 'devel' into merge