Merge branch 'master' of gitorious.org:daarmaan/daarmaan into sso_changes
authorSameer Rahmani <lxsameer@gnu.org>
Tue, 7 May 2013 12:03:20 +0000 (16:33 +0430)
committerSameer Rahmani <lxsameer@gnu.org>
Tue, 7 May 2013 12:03:20 +0000 (16:33 +0430)
commit3495aabc4572fc87d069a11890f3eaf1824699dc
tree71966a4931cbf599ada488cc1728b39fc841080b
parentf24baa0657f4579a8055f31f1727d405211bf9d0
parent9273dac33b8a93306e74d82a0a1150ece4bd84c3
Merge branch 'master' of gitorious.org:daarmaan/daarmaan into sso_changes