projects / diaspy.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 51ab5af 16253d1)
Merge branch 'master' into settings
authorMarek Marecki <marekjm@taistelu.com>
Sat, 24 Aug 2013 13:23:01 +0000 (15:23 +0200)
committerMarek Marecki <marekjm@taistelu.com>
Sat, 24 Aug 2013 13:23:01 +0000 (15:23 +0200)

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.