OpenSC/OpenSC — pull request #26 by viktorTarasov (2012-02-22 10:44:28+00:00)
Title: merge 'master' into 'staged'

Not sure that it's the optimal procedure to merge the OpenSC/master into OpenSC/staging

This request if part of following procedure:
- OpenSC/master pulled by local-clone/master
- local-clone/master merged into local-clone/staging
- local-clone/staging pushed to clone/staging
- clone/staging reqests to pull the OpenSC/staging

Probably, instead it should be:
- OpenSC/master requestd to pull the OpenSC/staging

But in this case how to resolve the possible conflicts?

Any comments/suggestions?