Merge branch 'master' into release-1.4.2
authormasensio <masensio@solidgear.es>
Tue, 16 Jul 2013 07:05:34 +0000 (09:05 +0200)
committermasensio <masensio@solidgear.es>
Tue, 16 Jul 2013 07:05:34 +0000 (09:05 +0200)
commitc7188eb833a3e1c7c514ad8ec36b90010896acfd
tree223405b1d70cff4fbe91e51ca6fb91ad8d626cce
parenta4b736e91cae786254dcbf7a68cabd873bab42dd
parente3a1fb510dc34325212aecf7f54a9c3bdb1b0041
Merge branch 'master' into release-1.4.2