Merge mainline changes
commitbf1733d347ebc9b897d0138cbe49a119c233033a
authorMaurizio Lombardi <m.lombardi85@gmail.com>
Mon, 27 Apr 2015 20:24:41 +0000 (27 22:24 +0200)
committerMaurizio Lombardi <m.lombardi85@gmail.com>
Mon, 27 Apr 2015 20:24:41 +0000 (27 22:24 +0200)
tree0c26dadd63f2dcd6e9f41495930b9e12161b4e46
parentc1fd281454459feab4756bc576e6f4e4e370bc92
parentdcba81992b1e3b37a4ec931392dd5e0a9a8e21fe
Merge mainline changes