Merge branch 'master' of sentx.net:/git/semece
commit27902fc27570cff64b72247b5c87fe5859e3079e
authorAbel Abraham Camarillo Ojeda <acamari@verlet.org>
Mon, 20 Dec 2010 10:14:22 +0000 (20 04:14 -0600)
committerAbel Abraham Camarillo Ojeda <acamari@verlet.org>
Mon, 20 Dec 2010 10:14:22 +0000 (20 04:14 -0600)
tree60e2e24e7ba17c590e1f2dc21982419431d92919
parentb617a2648c9e3de46816ae81f0960fe234c637bf
parent58a36c0caa17f9f65f87cc8c2187b2d0dc22fe07
Merge branch 'master' of sentx.net:/git/semece