Merge
authorJuan Pablo Aroztegi <juanpablo.aroztegi@openbravo.com>
Fri, 09 Oct 2009 11:35:31 +0200
changeset 5086 217952fe2d6a
parent 5085 7b09f958bcd7 (current diff)
parent 5084 63ac0101a9ba (diff)
child 5087 648fb3683fef
Merge
--- a/.hgsigs	Wed Oct 07 13:31:06 2009 +0200
+++ b/.hgsigs	Fri Oct 09 11:35:31 2009 +0200
@@ -5,3 +5,4 @@
 a6f332641aa432d7f95ca0573188bea0325cae07 0 iEYEABECAAYFAkqbY88ACgkQMWZMecruBGwq4ACgknNbFFRej6y27dVjXSWx/J0azw0AnRuzB5bVx8qpVzKGHbjNkH+zb1iS
 42782aedb04befc8fffaf9c23e6d70622a18239e 0 iEUEABECAAYFAkqegrwACgkQSO9EMJSZ6bxIJQCY9NHVx3ur1uZTcVPejHQhKOd/1gCeJT9yR/Rw+1mOkvlxxNqutO3mC5g=
 70052b5cd164664443305e080dff95632a35db74 0 iEYEABECAAYFAkrCRtoACgkQz3UmZbtB87D7rACgg7XykiUXmzcifLLzi9JForObga0AoImS+wW0PU2pSC6zqS3gt2pA5yiH
+9d3a0d3eb72d7b3e751413809fceaa8142b0484a 0 iEYEABECAAYFAkrKN+IACgkQz3UmZbtB87CZ7QCaAllz+OE3JigDDtIXvWpizebbN4UAn2lxlkyEZc/5tqvds2M56AkGJLfM
--- a/.hgtags	Wed Oct 07 13:31:06 2009 +0200
+++ b/.hgtags	Fri Oct 09 11:35:31 2009 +0200
@@ -14,3 +14,5 @@
 2b559105f5535152729cd1810112464a554aabc1 2.50MP4
 600c52248c85af3be704de38fdb1853cf4cce193 2.50MP5
 2f73303f7d0489ab203074fcdb9baea21dd10d3f 2.50MP6
+2f73303f7d0489ab203074fcdb9baea21dd10d3f 2.50MP6
+0915b92ee31ccfa42e9b2ca98dc07f113c7e16b0 2.50MP6