Permalink
Browse files

Merge branch 'trunk'

  • Loading branch information...
andreil committed Aug 2, 2012
2 parents 1aed167 + 1097d9a commit e1a392b6bdd8d1d7916f51fe88958e0f452638b2
Showing with 0 additions and 0 deletions.

1 comment on commit e1a392b

@andreil

This comment has been minimized.

Show comment Hide comment
@andreil

andreil Aug 2, 2012

Contributor

Merge the diverged trunk with xen-org/blktap. This wasn't supposed to happen, but it somehow did (possibly when we remapped xen-org/blktap from trunk to trunk-storage).

Contributor

andreil commented on e1a392b Aug 2, 2012

Merge the diverged trunk with xen-org/blktap. This wasn't supposed to happen, but it somehow did (possibly when we remapped xen-org/blktap from trunk to trunk-storage).

Please sign in to comment.