Merge branch 'master', remote-tracking branch 'origin'
authorDavid A. Velasco <dvelasco@solidgear.es>
Wed, 11 Jul 2012 16:47:27 +0000 (18:47 +0200)
committerDavid A. Velasco <dvelasco@solidgear.es>
Wed, 11 Jul 2012 16:47:27 +0000 (18:47 +0200)
commitf692bf7ae67b050345c14ec5e914cb3b1c0a950b
tree1b081a22293ddb234f3487b5bfc293ae0844c4c3
parentd4f8391f509b4b211d6742db6db546b80e8277c7
parenta70c4c658fa261a1944c7ca12ee3cea3e58e7ad5
Merge branch 'master', remote-tracking branch 'origin'