Merge branch 'maint-1.0' into maint-1.1
- maint-1.0: intbitset: no crash when intbitset is on rhs
Conflicts:
modules/miscutil/lib/intbitset.c
modules/miscutil/lib/intbitset.pyx
Signed-off-by: Tibor Simko <tibor.simko@cern.ch>
Tibor Simko <tibor.simko@cern.ch> | Dec 16 2013, 20:44 |
Commit | Author | Details | Committed | |||
---|---|---|---|---|---|---|
ab687a1351d5 | Samuele Kaplun/Tibor Simko | intbitset: no crash when intbitset is on rhs | Dec 16 2013 |