projects / diaspy.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b7a1503 2d4f6ee)
Merge branch 'devel' into settings
authorMarek Marecki <marekjm@taistelu.com>
Thu, 8 Aug 2013 17:37:09 +0000 (19:37 +0200)
committerMarek Marecki <marekjm@taistelu.com>
Thu, 8 Aug 2013 17:37:09 +0000 (19:37 +0200)

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