Back-port d1cdce1b0 from v3.0.x
[freeradius.git] / share / dictionary.nokia.conflict
2014-06-13 Arran Cudbard-BellMerge pull request #685 from sylphlin/v2.x.x
2013-08-28 Arran Cudbard-BellFixup dictionary formatting
2011-11-17 Alan T. DeKokInclude copyright lines
2007-08-17 aland Moved conflicting attributes to dictionary.nokia.confl...