Skip to content
Commit 57e0febd authored by Shea Levy's avatar Shea Levy
Browse files

Merge branch 'pkg/batman-adv-2015.2' of git://github.com/mayflower/nixpkgs

parents 025770fd 7f144d8f
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment