test jenkins CI #68

Closed
wants to merge 2 commits into
from
Commits on Mar 20, 2013
  1. test jenkins CI

    breu committed Mar 20, 2013
  2. fix merge conflict

    breu committed Mar 20, 2013