Branch: refs/heads/master
Home: https://github.com/yast/yast-ldap
Commit: e92843397f20170aa440ad14b948ffe743a46b0f
https://github.com/yast/yast-ldap/commit/e92843397f20170aa440ad14b948ffe743a...
Author: Josef Reidinger
Date: 2014-02-04 (Tue, 04 Feb 2014)
Changed paths:
M package/yast2-ldap.changes
M package/yast2-ldap.spec
Log Message:
-----------
release fix for conflict
Commit: 52a2993b24576f126d900c9ba09b4c2da6460681
https://github.com/yast/yast-ldap/commit/52a2993b24576f126d900c9ba09b4c2da64...
Author: Josef Reidinger
Date: 2014-02-04 (Tue, 04 Feb 2014)
Changed paths:
M package/yast2-ldap.changes
M package/yast2-ldap.spec
M src/Ldap.rb
Log Message:
-----------
Merge branch 'master' of github.com:yast/yast-ldap into fix_conflicts
Conflicts:
package/yast2-ldap.changes
Commit: 632e9f3f17a71cf220419f05fd5cdc12226c115b
https://github.com/yast/yast-ldap/commit/632e9f3f17a71cf220419f05fd5cdc12226...
Author: Peter Varkoly
Date: 2014-02-04 (Tue, 04 Feb 2014)
Changed paths:
M package/yast2-ldap.changes
M package/yast2-ldap.spec
Log Message:
-----------
Merge pull request #9 from yast/fix_conflicts
release fix for conflict
Compare: https://github.com/yast/yast-ldap/compare/ba257698498c...632e9f3f17a7