Merge branch 'release/2.18/master' into ibm/2.18/master
commit760b348db29b446efc760b4bc3627379cc61b0d8
authorTulio Magno Quites Machado Filho <tuliom@linux.vnet.ibm.com>
Tue, 20 Aug 2013 18:26:27 +0000 (20 15:26 -0300)
committerTulio Magno Quites Machado Filho <tuliom@linux.vnet.ibm.com>
Tue, 20 Aug 2013 18:26:27 +0000 (20 15:26 -0300)
tree795e018e810b045d030a627f099261853d7a4a87
parent84dd3946e0e0aee66635ba4373943d113fd25ca1
parenteefa3be8e4c2c721a9f277d8ea2e11180231829f
Merge branch 'release/2.18/master' into ibm/2.18/master