[django/django] 2bacc9: [1.7.x] Mark initial_data as deprecated separately...

[GitHub]

Branch: refs/heads/stable/1.7.x
Home: https://github.com/django/django
Commit: 2bacc9f3b70e45b172675452b7dd32900fbb8a8b
https://github.com/django/django/commit/2bacc9f3b70e45b172675452b7dd32900fbb8a8b
Author: Andrew Godwin <and...@aeracode.org>
Date: 2014-07-25 (Fri, 25 Jul 2014)

Changed paths:
M django/core/management/commands/loaddata.py
M docs/internals/deprecation.txt
M docs/releases/1.7.txt

Log Message:
-----------
[1.7.x] Mark initial_data as deprecated separately from syncdb. Refs #23077.

Conflicts:
docs/internals/deprecation.txt