test CI #69

Merged
merged 3 commits into from Mar 20, 2013
Commits on Mar 20, 2013
  1. test jenkins CI

    breu committed Mar 20, 2013
  2. fix merge conflict

    breu committed Mar 20, 2013
  3. testing CI

    breu committed Mar 20, 2013