Skip to content

Commit

Permalink
Merge branch 'trunk'
Browse files Browse the repository at this point in the history
  • Loading branch information
andreil committed Aug 2, 2012
2 parents 1aed167 + 1097d9a commit e1a392b
Showing 0 changed files with 0 additions and 0 deletions.

1 comment on commit e1a392b

@andreil
Copy link
Contributor Author

@andreil andreil commented on e1a392b Aug 2, 2012

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.