Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Already on GitHub? Sign in to your account

Merge 2 0 stable #21

Merged
merged 6 commits into from Apr 17, 2012

Conversation

Projects
None yet
2 participants
Owner

parndt commented Apr 16, 2012

This replaces #20 as I've done the "hard work" of merge conflicts.

@parndt parndt referenced this pull request Apr 16, 2012

Closed

2 0 stable merge #20

ugisozols added a commit that referenced this pull request Apr 17, 2012

@ugisozols ugisozols merged commit c126193 into master Apr 17, 2012

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment