git.samba.org / kai / samba-autobuild / .git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 1a6415f 695b666)
Merge commit 'origin/v3-2-test' into v3-2-stable
authorKarolin Seeger <kseeger@samba.org>
Fri, 29 Feb 2008 09:44:38 +0000 (10:44 +0100)
committerKarolin Seeger <kseeger@samba.org>
Fri, 29 Feb 2008 09:44:38 +0000 (10:44 +0100)
commitc4fbe2846231a6b322c1094c6a1dbf93b7305768
tree09eb77a294f4acda131b41fe4c9bec4ed175eb16tree
parent1a6415fc77c708b87c8e2ce6e7828f486ffc87accommit | diff
parent695b6662abe64a40061bfa05ede12173fc4b1945commit | diff
Merge commit 'origin/v3-2-test' into v3-2-stable

Conflicts:

WHATSNEW.txt
(This used to be commit a390bcf9403df4cf4d5eef42b35ebccbe253882e)
WHATSNEW.txt diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.