Merge remote-tracking branch 'origin/release-1.5.4' into release-1.5.4
authormasensio <masensio@solidgear.es>
Mon, 17 Feb 2014 12:03:30 +0000 (13:03 +0100)
committermasensio <masensio@solidgear.es>
Mon, 17 Feb 2014 12:03:30 +0000 (13:03 +0100)
commit55e2a45ab8721c9b64274bc182f72a5666d671de
tree1acf75578328706450938c1a53b2e419dfc21beb
parent47c90583eaa4afe92eb0526577c026101b97658a
parentfd0b92e9f2575b74d82e1748b009b94d3a520bec
Merge remote-tracking branch 'origin/release-1.5.4' into release-1.5.4