Merge branch 'feature/provider_display_name' of https://github.com/svbergerem/diaspy...
authorMarek Marecki <marekjm@taistelu.com>
Sat, 7 Sep 2013 19:33:23 +0000 (21:33 +0200)
committerMarek Marecki <marekjm@taistelu.com>
Sat, 7 Sep 2013 19:33:23 +0000 (21:33 +0200)
commit7c53537b8f2070a2df85a6f9e71893ebe07b2e6a
treef9bd7b981db1442e5328d4ba81489d10c121551a
parent79a0fc1952dbeceb3ca32557cfc3f6f1ebbc896f
parent952a429ec1da3ab73f33d7a5edc742886ab98e57
Merge branch 'feature/provider_display_name' of https://github.com/svbergerem/diaspy into svebergem-feature/provider_display_name