Merge branch 'master' of ssh://xp-dev.com/RRRRHHHH_Artifacts
authorEneko Pinzolas Murua <kelossus@localhost.localdomain>
Wed, 15 Apr 2015 16:27:16 +0000 (18:27 +0200)
committerEneko Pinzolas Murua <kelossus@localhost.localdomain>
Wed, 15 Apr 2015 16:27:16 +0000 (18:27 +0200)

Trivial merge